[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Emilia Kasper]

The branch OpenSSL_1_0_1-stable has been updated
       via  e963109fcd4973a6ba13415421b21c1b8aebaf74 (commit)
      from  da23637e8e04387689ef8747e8229a0c325a25fc (commit)


- Log -----------------------------------------------------------------
commit e963109fcd4973a6ba13415421b21c1b8aebaf74
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Jul 8 23:06:59 2014 +0200

    Please Clang's sanitizer, addendum.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 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 2e1a7e8..27d31f7 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 e42a1c1..5cd755d 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);
 }