diff options
| author | mmcc <> | 2015-12-23 20:37:23 +0000 |
|---|---|---|
| committer | mmcc <> | 2015-12-23 20:37:23 +0000 |
| commit | 0acfd6965d2e7de3e9d3fff1348f689e59164fb7 (patch) | |
| tree | 6a0bcb7c2382a4d5e6eb2313bd14754a09b5deb7 /src/lib/libcrypto/asn1 | |
| parent | 9aa6664d2b19fc6a669e2d548bbb7e3bec9e6012 (diff) | |
| download | openbsd-0acfd6965d2e7de3e9d3fff1348f689e59164fb7.tar.gz openbsd-0acfd6965d2e7de3e9d3fff1348f689e59164fb7.tar.bz2 openbsd-0acfd6965d2e7de3e9d3fff1348f689e59164fb7.zip | |
remove NULL-checks before free()
Diffstat (limited to 'src/lib/libcrypto/asn1')
| -rw-r--r-- | src/lib/libcrypto/asn1/asn_pack.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/asn_pack.c b/src/lib/libcrypto/asn1/asn_pack.c index f010f87bbd..65f4b9bf97 100644 --- a/src/lib/libcrypto/asn1/asn_pack.c +++ b/src/lib/libcrypto/asn1/asn_pack.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: asn_pack.c,v 1.14 2014/07/11 13:41:59 miod Exp $ */ | 1 | /* $OpenBSD: asn_pack.c,v 1.15 2015/12/23 20:37:23 mmcc Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -180,10 +180,8 @@ ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct) | |||
| 180 | } else | 180 | } else |
| 181 | octmp = *oct; | 181 | octmp = *oct; |
| 182 | 182 | ||
| 183 | if (octmp->data) { | 183 | free(octmp->data); |
| 184 | free(octmp->data); | 184 | octmp->data = NULL; |
| 185 | octmp->data = NULL; | ||
| 186 | } | ||
| 187 | 185 | ||
| 188 | if (!(octmp->length = ASN1_item_i2d(obj, &octmp->data, it))) { | 186 | if (!(octmp->length = ASN1_item_i2d(obj, &octmp->data, it))) { |
| 189 | ASN1err(ASN1_F_ASN1_ITEM_PACK, ASN1_R_ENCODE_ERROR); | 187 | ASN1err(ASN1_F_ASN1_ITEM_PACK, ASN1_R_ENCODE_ERROR); |
