Bug 1546477 - FIPS review changes. r=mt, Fix memory leak in error pat…

…h issue --HG-- extra : transplant_source : %B1%F1B%0D%90%C0%08%7D%C3%D8%BC%87%E5%B86%A3%B6%CEB%95
sailfishos-mirror · Jun 1, 2019 · fbc7f55 · fbc7f55
1 parent efac930
commit fbc7f55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/gtests/pk11_gtest/manifest.mn b/gtests/pk11_gtest/manifest.mn
@@ -7,6 +7,7 @@ DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
+      pk11_aes_gcm_unittest.cc \
       pk11_aeskeywrap_unittest.cc \
       pk11_cbc_unittest.cc \
       pk11_chacha20poly1305_unittest.cc \

diff --git a/lib/freebl/rijndael.c b/lib/freebl/rijndael.c
@@ -1041,6 +1041,10 @@ AES_DestroyContext(AESContext *cx, PRBool freeit)
     PORT_Memset(cx, 0, sizeof(AESContext));
     if (freeit) {
         PORT_Free(mem);
+    } else {
+	/* if we are not freeing the context, restore mem, We may get called
+         * again to actually free the context */
+	cx->mem = mem;
     }
 }