diff options
| author |   tedu <tedu@openbsd.org> | 2014-05-04 19:06:40 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-05-04 19:06:40 +0000 |
| commit | fee20d6336ae737dbb28e9f2039be59c1ba09b25 (patch) | |
| tree | dad3540e2a5ee7898c3a0aad9f225b3b0c1cfd72 | |
| parent | format string fix for bus_space_tag_t (diff) | |
| download | wireguard-openbsd-fee20d6336ae737dbb28e9f2039be59c1ba09b25.tar.xz wireguard-openbsd-fee20d6336ae737dbb28e9f2039be59c1ba09b25.zip | |
i give up. reuse problem is unfixable. dlg says puppet crashes.
| -rw-r--r-- | lib/libcrypto/asn1/tasn_dec.c | 12 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/tasn_dec.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/lib/libcrypto/asn1/tasn_dec.c b/lib/libcrypto/asn1/tasn_dec.c index d86bc4e0915..c8b379f371f 100644 --- a/lib/libcrypto/asn1/tasn_dec.c +++ b/lib/libcrypto/asn1/tasn_dec.c @@ -382,14 +382,10 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, goto err; } - if (!*pval) { - if (!ASN1_item_ex_new(pval, it)) { - ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, - ERR_R_NESTED_ASN1_ERROR); - goto err; - } - } else { - memset(*pval, 0, it->size); + if (!*pval && !ASN1_item_ex_new(pval, it)) { + ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, + ERR_R_NESTED_ASN1_ERROR); + goto err; } if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) diff --git a/lib/libssl/src/crypto/asn1/tasn_dec.c b/lib/libssl/src/crypto/asn1/tasn_dec.c index d86bc4e0915..c8b379f371f 100644 --- a/lib/libssl/src/crypto/asn1/tasn_dec.c +++ b/lib/libssl/src/crypto/asn1/tasn_dec.c @@ -382,14 +382,10 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, goto err; } - if (!*pval) { - if (!ASN1_item_ex_new(pval, it)) { - ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, - ERR_R_NESTED_ASN1_ERROR); - goto err; - } - } else { - memset(*pval, 0, it->size); + if (!*pval && !ASN1_item_ex_new(pval, it)) { + ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, + ERR_R_NESTED_ASN1_ERROR); + goto err; } if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) |