From 7551264186f176ca5801aa84d60c7b91d8fba31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0ulc?= Date: Thu, 20 Jul 2023 21:30:45 +0200 Subject: fix: reject adding a duplicity into STACK_OF(X509_ATTRIBUTE) Function `X509at_add1_attr()` (crypto/x509/x509_att.c) rejects to add a duplicity into `*x` but it searches in a wrong stack. Changed to search in `*x`. CLA: trivial Reviewed-by: Kurt Roeckx Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/21505) --- crypto/x509/x509_att.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto') diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c index 1fc99f7cad..325a0dc1dd 100644 --- a/crypto/x509/x509_att.c +++ b/crypto/x509/x509_att.c @@ -89,7 +89,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); return NULL; } - if (X509at_get_attr_by_OBJ(sk, attr->object, -1) != -1) { + if (*x != NULL && X509at_get_attr_by_OBJ(*x, attr->object, -1) != -1) { ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); return NULL; } -- cgit v1.2.3