fix memory leaks. from Dirk Engling

1 files changed, 4 insertions, 7 deletions

diff --git a/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c
index c213c7a88d..14f6554ab3 100644
--- a/src/lib/libcrypto/asn1/f_string.c
+++ b/src/lib/libcrypto/asn1/f_string.c
@@ -154,8 +154,6 @@ a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
                         if (sp == NULL) {
                                 ASN1err(ASN1_F_A2I_ASN1_STRING,
                                     ERR_R_MALLOC_FAILURE);
-                                if (s != NULL)
-                                        free(s);
                                 goto err;
                         }
                         s = sp;
@@ -187,12 +185,11 @@ a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
         }
         bs->length = num;
         bs->data = s;
-        ret = 1;
+        return (1);
 
-err:
-        if (0) {
 err_sl:
-                ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_SHORT_LINE);
-        }
+        ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_SHORT_LINE);
+err:
+        free(s);
         return (ret);
 }