summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-05-20 08:00:05 +0000
committertb <>2022-05-20 08:00:05 +0000
commit3f2d19fd2eff02b5cd51e6c5c791d08a774f5320 (patch)
tree2239a843d4bcbdf576b4cf81812d30a2c5e596c2 /src
parentba53f4bba98f619b544683f065e2d2633476ef19 (diff)
downloadopenbsd-3f2d19fd2eff02b5cd51e6c5c791d08a774f5320.tar.gz
openbsd-3f2d19fd2eff02b5cd51e6c5c791d08a774f5320.tar.bz2
openbsd-3f2d19fd2eff02b5cd51e6c5c791d08a774f5320.zip
Don't pass uninitialized pointer to ASN1_STRING_to_UTF8()
Exposed by recent rewrite of ASN1_STRING_to_UTF8(). Found via grep after fixing CID 352831. ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_kiss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index 54a8092609..1e221f4436 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_kiss.c,v 1.21 2021/07/09 14:08:00 tb Exp $ */ 1/* $OpenBSD: p12_kiss.c,v 1.22 2022/05/20 08:00:05 tb 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 */
@@ -265,7 +265,7 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
265 } 265 }
266 if (fname) { 266 if (fname) {
267 int len, r; 267 int len, r;
268 unsigned char *data; 268 unsigned char *data = NULL;
269 len = ASN1_STRING_to_UTF8(&data, fname); 269 len = ASN1_STRING_to_UTF8(&data, fname);
270 if (len >= 0) { 270 if (len >= 0) {
271 r = X509_alias_set1(x509, data, len); 271 r = X509_alias_set1(x509, data, len);