diff options
author | deraadt <> | 2014-04-21 11:37:41 +0000 |
---|---|---|
committer | deraadt <> | 2014-04-21 11:37:41 +0000 |
commit | a13698710d1bf0bac4832733da5c86886601b5d4 (patch) | |
tree | ad42acc3896c553cb79781bc3a1ead69a74d55a3 /src/lib/libcrypto/asn1/f_enum.c | |
parent | 6a6b6afb12953d4537a41790daa6abaad39258c5 (diff) | |
download | openbsd-a13698710d1bf0bac4832733da5c86886601b5d4.tar.gz openbsd-a13698710d1bf0bac4832733da5c86886601b5d4.tar.bz2 openbsd-a13698710d1bf0bac4832733da5c86886601b5d4.zip |
improve realloc/calloc/malloc patterns; ok guenther
Diffstat (limited to 'src/lib/libcrypto/asn1/f_enum.c')
-rw-r--r-- | src/lib/libcrypto/asn1/f_enum.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/f_enum.c b/src/lib/libcrypto/asn1/f_enum.c index e8736e5b72..98fa312266 100644 --- a/src/lib/libcrypto/asn1/f_enum.c +++ b/src/lib/libcrypto/asn1/f_enum.c | |||
@@ -154,12 +154,7 @@ a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size) | |||
154 | } | 154 | } |
155 | i /= 2; | 155 | i /= 2; |
156 | if (num + i > slen) { | 156 | if (num + i > slen) { |
157 | if (s == NULL) | 157 | sp = realloc(s, (unsigned int)num + i * 2); |
158 | sp = (unsigned char *)malloc( | ||
159 | (unsigned int)num + i * 2); | ||
160 | else | ||
161 | sp = (unsigned char *)realloc(s, | ||
162 | (unsigned int)num + i * 2); | ||
163 | if (sp == NULL) { | 158 | if (sp == NULL) { |
164 | ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, | 159 | ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, |
165 | ERR_R_MALLOC_FAILURE); | 160 | ERR_R_MALLOC_FAILURE); |