Catch ber_scanf errors properly

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 79d99003af4b977dc796aa23a55ffc159aff45cc..b9397df38e29e896b70ede5e1fcd8c4225631287 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1525,8 +1525,8 @@ connection_input( Connection *conn , conn_readinfo *cri )
 #ifdef LDAP_CONNECTIONLESS
        if( conn->c_is_udp ) {
                if( tag == LBER_OCTETSTRING ) {
-                       ber_get_stringa( ber, &cdn );
-                       tag = ber_peek_tag(ber, &len);
+                       if ( (tag = ber_get_stringa( ber, &cdn )) != LBER_ERROR )
+                               tag = ber_peek_tag( ber, &len );
                }
                if( tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH ) {
                        Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0, 0 );

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index d2f1172ed1ea1848be239c3d4e5c4337604bb342..246b4ac6b13c0cd856f6d097bf281f6c0a064f3a 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -402,8 +402,7 @@ get_ssa(
        {
                unsigned usage;
 
-               rc = ber_scanf( ber, "m", &value );
-               if ( rc == LBER_ERROR ) {
+               if ( ber_scanf( ber, "m", &value ) == LBER_ERROR ) {
                        rc = SLAPD_DISCONNECT;
                        goto return_error;
                }