Skip to content

Commit c089301

Browse files
committed
pkcs7: disallow ossl_pkcs7{si,ri}_new(NULL)
These functions are not actually called with NULL.
1 parent ef27708 commit c089301

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

ext/openssl/ossl_pkcs7.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,27 +153,29 @@ ossl_PKCS7_RECIP_INFO_dup(PKCS7_RECIP_INFO *si)
153153
static VALUE
154154
ossl_pkcs7si_new(PKCS7_SIGNER_INFO *p7si)
155155
{
156-
PKCS7_SIGNER_INFO *pkcs7;
156+
PKCS7_SIGNER_INFO *p7si_new;
157157
VALUE obj;
158158

159159
obj = NewPKCS7si(cPKCS7Signer);
160-
pkcs7 = p7si ? ossl_PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
161-
if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
162-
SetPKCS7si(obj, pkcs7);
160+
p7si_new = ossl_PKCS7_SIGNER_INFO_dup(p7si);
161+
if (!p7si_new)
162+
ossl_raise(ePKCS7Error, "ASN1_dup");
163+
SetPKCS7si(obj, p7si_new);
163164

164165
return obj;
165166
}
166167

167168
static VALUE
168169
ossl_pkcs7ri_new(PKCS7_RECIP_INFO *p7ri)
169170
{
170-
PKCS7_RECIP_INFO *pkcs7;
171+
PKCS7_RECIP_INFO *p7ri_new;
171172
VALUE obj;
172173

173174
obj = NewPKCS7ri(cPKCS7Recipient);
174-
pkcs7 = p7ri ? ossl_PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
175-
if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
176-
SetPKCS7ri(obj, pkcs7);
175+
p7ri_new = ossl_PKCS7_RECIP_INFO_dup(p7ri);
176+
if (!p7ri_new)
177+
ossl_raise(ePKCS7Error,"ASN1_dup");
178+
SetPKCS7ri(obj, p7ri_new);
177179

178180
return obj;
179181
}

0 commit comments

Comments
 (0)