resolve conflicts

1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index f4ea96cd54..b81bf4fc81 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -194,8 +194,12 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
                         c=(unsigned char *)OPENSSL_realloc_clean(a->data,
                                                                  a->length,
                                                                  w+1);
-                if (c == NULL) return(0);
-                if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length);
+                if (c == NULL)
+                        {
+                        ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT,ERR_R_MALLOC_FAILURE);
+                        return 0;
+                        }
+                if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length);
                 a->data=c;
                 a->length=w+1;
         }