Fix ITS#1843, don't deref NULL string in ldap_pvt_str2upper

[openldap] / libraries / libldap / os-local.c

diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index f05ceb6cb27291af5e61c8487b449432878673da..8b3da9f2285d919e42e786f8f973b2b649f404b2 100644 (file)
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -97,9 +97,9 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #if defined( notyet ) /* && defined( SO_ERROR ) */
 {
        int so_errno;
-       int dummy = sizeof(so_errno);
+       socklen_t dummy = sizeof(so_errno);
        if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy )
-               == SOCKET_ERROR )
+               == AC_SOCKET_ERROR )
        {
                return -1;
        }
@@ -115,9 +115,9 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
        /* error slippery */
        struct sockaddr_un sa;
        char ch;
-       int dummy = sizeof(sa);
+       socklen_t dummy = sizeof(sa);
        if ( getpeername( s, (struct sockaddr *) &sa, &dummy )
-               == SOCKET_ERROR )
+               == AC_SOCKET_ERROR )
        {
                /* XXX: needs to be replace with ber_stream_read() */
                read(s, &ch, 1);
@@ -149,7 +149,7 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async)
                return ( -1 );
 
        if ( connect(s, (struct sockaddr *) sa, sizeof(struct sockaddr_un))
-               != SOCKET_ERROR )
+               != AC_SOCKET_ERROR )
        {
                if ( ldap_pvt_ndelay_off(ld, s) == -1 ) {
                        return ( -1 );
@@ -169,7 +169,7 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async)
        FD_SET(s, &wfds );
 
        if ( select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL)
-               == SOCKET_ERROR )
+               == AC_SOCKET_ERROR )
        {
                return ( -1 );
        }