ITS#9328 cldap: check for error on connected socket

libldap doesn't use a connected socket for UDP sessions, but 3rd
parties can, passed in with ldap_init_fd().

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index bdced135bb55e1198be4aa93141ba120ce02d27b..e2b2206305be4d77ec5960bfc148b9a10396c61e 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -486,7 +486,8 @@ retry:
 #ifdef LDAP_CONNECTIONLESS
        if ( LDAP_IS_UDP(ld) ) {
                struct sockaddr_storage from;
-               ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr_storage) );
+               if ( ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr_storage) ) < 0 )
+                       goto fail;
                if ( ld->ld_options.ldo_version == LDAP_VERSION2 ) isv2 = 1;
        }
 nextresp3:
@@ -502,10 +503,11 @@ nextresp3:
                break;
 
        case LBER_DEFAULT:
+fail:
                err = sock_errno();
 #ifdef LDAP_DEBUG                 
                Debug( LDAP_DEBUG_CONNS,
-                       "ber_get_next failed.\n", 0, 0, 0 );
+                       "ber_get_next failed, errno=%d.\n", err, 0, 0 );
 #endif            
                if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING;
                if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING;