Add a safety check to bvcasechr

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index d28360319831a3d4fd2494c192b6acbccde68746..cc3cc8cc9eb31372ca107d777e7e6114e3688743 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,7 +1,7 @@
 /* abandon.c - decode and handle an ldap abandon operation */
 /* $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
  */
 
@@ -32,7 +32,7 @@ do_abandon(
 {
        ber_int_t               id;
        Operation       *o;
-       int rc, notfound;
+       int rc;
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n",
@@ -83,7 +83,6 @@ do_abandon(
                return LDAP_SUCCESS;
        }
 
-       notfound = 1; /* not found */
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
        /*
         * find the operation being abandoned and set the o_abandon
@@ -91,26 +90,21 @@ do_abandon(
         * flag and abort the operation at a convenient time.
         */
 
-       STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
+       LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
                if ( o->o_msgid == id ) {
                        ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
                        o->o_abandon = 1;
                        ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
-
-                       notfound = 0;
                        goto done;
                }
        }
 
-       STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
-               if ( o->o_msgid == id )
-                       break;
-       }
-
-       if( o != NULL ) {
-               STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
-               slap_op_free( o );
-               notfound = 0;
+       LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
+               if ( o->o_msgid == id ) {
+                       LDAP_STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
+                       slap_op_free( o );
+                       goto done;
+               }
        }
 
 done:
@@ -119,10 +113,10 @@ done:
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
                "do_abandon: conn: %d op=%ld %sfound\n",
-               conn->c_connid, (long)id, notfound ? "not " : "" ));
+               conn->c_connid, (long)id, o ? "" : "not " ));
 #else
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
-               (long) id, notfound ? "not " : "", 0 );
+               (long) id, o ? "" : "not ", 0 );
 #endif
        return LDAP_SUCCESS;
 }