Please Clang's sanitizer, addendum.
authorAndy Polyakov <appro@openssl.org>
Tue, 8 Jul 2014 21:06:59 +0000 (23:06 +0200)
committerAndy Polyakov <appro@openssl.org>
Tue, 8 Jul 2014 21:06:59 +0000 (23:06 +0200)
crypto/engine/eng_table.c
crypto/objects/obj_dat.c

index 93dc90e..74e1adf 100644 (file)
@@ -346,6 +346,8 @@ void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb,
        ENGINE_PILE_DOALL dall;
        dall.cb = cb;
        dall.arg = arg;
-       lh_ENGINE_PILE_doall_arg(&table->piles, LHASH_DOALL_ARG_FN(int_cb),
-                                ENGINE_PILE_DOALL, &dall);
+       if (table)
+               lh_ENGINE_PILE_doall_arg(&table->piles,
+                               LHASH_DOALL_ARG_FN(int_cb),
+                               ENGINE_PILE_DOALL, &dall);
        }
index 959ad65..e515160 100644 (file)
@@ -140,7 +140,7 @@ static unsigned long added_obj_hash(const ADDED_OBJ *ca)
                return 0;
                }
        ret&=0x3fffffffL;
-       ret|=ca->type<<30L;
+       ret|=((unsigned long)ca->type)<<30L;
        return(ret);
        }
 static IMPLEMENT_LHASH_HASH_FN(added_obj, ADDED_OBJ)