From ac5436b462cb5ce4be448e9bf8ae5e533cfb946c Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Fri, 18 Nov 2016 09:40:26 -0700
Subject: [PATCH] PKCS12 : return on memory error

---
 wolfcrypt/src/pkcs12.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wolfcrypt/src/pkcs12.c b/wolfcrypt/src/pkcs12.c
index 0aeaa2c87..9e7453f11 100644
--- a/wolfcrypt/src/pkcs12.c
+++ b/wolfcrypt/src/pkcs12.c
@@ -920,11 +920,12 @@ int wc_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
                             if (k == NULL) {
                                 freeBuffers(*pkey, buf, pkcs12->heap);
                                 freeCertList(certList, pkcs12->heap);
+                                return MEMORY_E;
                             }
                         }
                         size = ret;
 
-			if (*pkey == NULL) {
+                        if (*pkey == NULL) {
                             *pkey = k;
                             *pkeySz = size;
                         }