Import latest leak fix from HEAD.

[openldap] / libraries / libldap / dsparse.c

diff --git a/libraries/libldap/dsparse.c b/libraries/libldap/dsparse.c
index 8ec7116fd9f2af43b18bb7d7d116c27cc3742ef0..2b7771c5bdf1b74dbcbf3d1d4fcbb2ff5c91cdbd 100644 (file)
--- a/libraries/libldap/dsparse.c
+++ b/libraries/libldap/dsparse.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
@@ -136,7 +135,7 @@ next_line( char **bufp, ber_len_t *blenp, char **linep )
        return( -1 );   /* fatal error */
     }
 
-    (void) memcpy( line, linestart, p - linestart );
+    AC_MEMCPY( line, linestart, p - linestart );
     line[ p - linestart - 1 ] = '\0';
     *linep = line;
     return( strlen( line ));
@@ -155,7 +154,7 @@ next_token( char **sp )
 
     p = *sp;
 
-    while ( isspace( (unsigned char) *p )) {   /* skip leading white space */
+    while ( LDAP_SPACE( (unsigned char) *p )) {        /* skip leading white space */
        ++p;
     }
 
@@ -170,7 +169,7 @@ next_token( char **sp )
     t = tokstart = p;
 
     for ( ;; ) {
-       if ( *p == '\0' || ( isspace( (unsigned char) *p ) && !in_quote )) {
+       if ( *p == '\0' || ( LDAP_SPACE( (unsigned char) *p ) && !in_quote )) {
            if ( *p != '\0' ) {
                ++p;
            }