resolve conflicts

1 files changed, 7 insertions, 5 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c
index eb837a78cf..5276b12669 100644
--- a/src/lib/libcrypto/pkcs12/p12_init.c
+++ b/src/lib/libcrypto/pkcs12/p12_init.c
@@ -76,15 +76,17 @@ PKCS12 *PKCS12_init (int mode)
                         if (!(pkcs12->authsafes->d.data =
                                  M_ASN1_OCTET_STRING_new())) {
                         PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-                        return NULL;
+                        goto err;
                 }
                 break;
                 default:
-                        PKCS12err(PKCS12_F_PKCS12_INIT,PKCS12_R_UNSUPPORTED_PKCS12_MODE);
-                        PKCS12_free(pkcs12);
-                        return NULL;
-                break;
+                        PKCS12err(PKCS12_F_PKCS12_INIT,
+                                PKCS12_R_UNSUPPORTED_PKCS12_MODE);
+                        goto err;
         }
                 
         return pkcs12;
+err:
+        if (pkcs12 != NULL) PKCS12_free(pkcs12);
+        return NULL;
 }