From e963109fcd4973a6ba13415421b21c1b8aebaf74 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 8 Jul 2014 23:06:59 +0200 Subject: [PATCH] Please Clang's sanitizer, addendum. Reviewed-by: Rich Salz --- crypto/engine/eng_table.c | 6 ++++-- crypto/objects/obj_dat.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index 2e1a7e855a..27d31f70c8 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -351,6 +351,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); } diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index e42a1c147d..5cd755d77d 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -142,7 +142,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); } -- 2.25.1