Import ITS#1935 fix from HEAD - overflow in ldap_pvt_hex_unescape()

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 0ac1b6f63b480a526c5d1930b86e18c3cbd3aa57..77171a51dfa588fa72d37a26587051d10651abfd 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -989,12 +989,14 @@ ldap_pvt_hex_unescape( char *s )
 
        for ( p = s; *s != '\0'; ++s ) {
                if ( *s == '%' ) {
-                       if ( *++s != '\0' ) {
-                               *p = ldap_pvt_unhex( *s ) << 4;
+                       if ( *++s == '\0' ) {
+                               break;
                        }
-                       if ( *++s != '\0' ) {
-                               *p++ += ldap_pvt_unhex( *s );
+                       *p = ldap_pvt_unhex( *s ) << 4;
+                       if ( *++s == '\0' ) {
+                               break;
                        }
+                       *p++ += ldap_pvt_unhex( *s );
                } else {
                        *p++ = *s;
                }