Function pop_info() returned a dangling pointer

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 8580447c0a16be9c09fae2915122a1f0feed14b5..67a48001ec042c827011dc1382978d46efeb4568 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -331,29 +331,31 @@ static unsigned long app_info_hash(const APP_INFO *a)
     return (ret);
 }
 
     return (ret);
 }
 

-static APP_INFO *pop_info(void)
+/* returns 1 if there was an info to pop, 0 if the stack was empty. */
+static int pop_info(void)

 {
     APP_INFO tmp;
 {
     APP_INFO tmp;

-    APP_INFO *ret = NULL;
+    APP_INFO *current = NULL;

 
     if (amih != NULL) {
         CRYPTO_THREADID_current(&tmp.threadid);
 
     if (amih != NULL) {
         CRYPTO_THREADID_current(&tmp.threadid);

-        if ((ret = lh_APP_INFO_delete(amih, &tmp)) != NULL) {
-            APP_INFO *next = ret->next;
+        if ((current = lh_APP_INFO_delete(amih, &tmp)) != NULL) {
+            APP_INFO *next = current->next;

 
             if (next != NULL) {
                 next->references++;
                 (void)lh_APP_INFO_insert(amih, next);
             }
 
             if (next != NULL) {
                 next->references++;
                 (void)lh_APP_INFO_insert(amih, next);
             }

-            if (--(ret->references) <= 0) {
-                ret->next = NULL;
+            if (--(current->references) <= 0) {
+                current->next = NULL;

                 if (next != NULL)
                     next->references--;
                 if (next != NULL)
                     next->references--;

-                OPENSSL_free(ret);
+                OPENSSL_free(current);

             }
             }

+            return 1;

         }
     }
         }
     }

-    return (ret);
+    return 0;

 }
 
 int CRYPTO_mem_debug_push(const char *info, const char *file, int line)
 }
 
 int CRYPTO_mem_debug_push(const char *info, const char *file, int line)


@@ -396,7 +398,7 @@ int CRYPTO_mem_debug_pop(void)
 
     if (mem_check_on()) {
         CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
 
     if (mem_check_on()) {
         CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);

-        ret = (pop_info() != NULL);
+        ret = pop_info();

         CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
     }
     return (ret);
         CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
     }
     return (ret);