More memory leaks and unchecked allocations; OpenSSL PR #3403 via OpenSSL

trunk. (note we had already fixed some of the issues in that PR independently)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/asn_pack.c b/src/lib/libcrypto/asn1/asn_pack.c
index 5d3fc3c34d..f010f87bbd 100644
--- a/src/lib/libcrypto/asn1/asn_pack.c
+++ b/src/lib/libcrypto/asn1/asn_pack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn_pack.c,v 1.13 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: asn_pack.c,v 1.14 2014/07/11 13:41:59 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -155,8 +155,11 @@ ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct)
                 *oct = octmp;
         return octmp;
 err:
-        if (!oct || octmp != *oct)
+        if (!oct || octmp != *oct) {
                 ASN1_STRING_free(octmp);
+                if (oct)
+                        *oct = NULL;
+        }
         return NULL;
 }