[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  210fe4edee6514e4c1f0677adc9112c4459da02b (commit)
      from  eb43101ff8c5c75d1ddf8b90de41d03cea1b0909 (commit)


- Log -----------------------------------------------------------------
commit 210fe4edee6514e4c1f0677adc9112c4459da02b
Author: Davide Galassi <davide.galassi at gmail.com>
Date:   Fri Dec 2 17:10:37 2016 +0100

    Avoid the call to OPENSSL_malloc with a negative value (then casted to unsigned)
    
    CLA: trivial
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2021)

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

Summary of changes:
 crypto/dso/dso_lib.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 8f185b3..ec3c59a 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -324,6 +324,9 @@ DSO *DSO_dsobyaddr(void *addr, int flags)
     char *filename = NULL;
     int len = DSO_pathbyaddr(addr, NULL, 0);
 
+    if (len < 0)
+        return NULL;
+
     filename = OPENSSL_malloc(len);
     if (filename != NULL
             && DSO_pathbyaddr(addr, filename, len) == len)