diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-07-08 23:06:59 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2015-04-16 18:29:49 +0200 |
| commit | e963109fcd4973a6ba13415421b21c1b8aebaf74 (patch) | |
| tree | f1a49d408d7880eb89d6c15251ff5435ed7a3c9a /crypto | |
| parent | da23637e8e04387689ef8747e8229a0c325a25fc (diff) | |
Please Clang's sanitizer, addendum.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/engine/eng_table.c | 6 | ||||
| -rw-r--r-- | 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); } |