make sure NULL pointers are not dereferenced

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index cc8fea04b81505c2e24edf6ec19c655cfb359bff..78ffc28ef60ecc226429be497cb4c7014be26328 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -840,6 +840,8 @@ meta_back_op_result(
                                *save_rmatch = NULL;
        void                    *rmatch_ctx = NULL;
 
+       assert( mc != NULL );
+
        if ( candidate != META_TARGET_NONE ) {
                metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
 

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index ef2a12991206b5539417d8c271f8d3a20f38537b..9cb55ccd7a899783422fc9db4bad93ac23906e7d 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -800,7 +800,11 @@ really_bad:;
                /*
                 * FIXME: need a better strategy to handle errors
                 */
-               rc = meta_back_op_result( mc, op, rs, META_TARGET_NONE );
+               if ( mc ) {
+                       rc = meta_back_op_result( mc, op, rs, META_TARGET_NONE );
+               } else {
+                       rc = rs->sr_err;
+               }
                goto finish;
        }