diff options
| author |   djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
| commit | 40d8aef356a70d0b13395f0805e3044b85d91347 (patch) | |
| tree | 22edbfd34c49ce1b7988794a7a74d65829c13819 /lib/libcrypto/asn1/a_bitstr.c | |
| parent | import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@ (diff) | |
| download | wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.tar.xz wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/asn1/a_bitstr.c')
| -rw-r--r-- | lib/libcrypto/asn1/a_bitstr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libcrypto/asn1/a_bitstr.c b/lib/libcrypto/asn1/a_bitstr.c index f4ea96cd54e..b81bf4fc81a 100644 --- a/lib/libcrypto/asn1/a_bitstr.c +++ b/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; } |