Fix native leak in CryptoNative_GetX509nameInfo

github-actions[bot] · vcsjones · web-flow · commit eeb75c9a83f8 · 2024-04-12T10:06:37.000-07:00
The implementation was previously only freeing the STACK_OF, but not the contents of the stack. This change fixes not freeing the individual GENERAL_NAME items.

Co-authored-by: Kevin Jones &lt;kevin@vcsjones.com&gt;
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c
@@ -593,8 +593,8 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue
                 break;
         }
 
-        STACK_OF(GENERAL_NAME)* altNames = (STACK_OF(GENERAL_NAME)*)(
-            X509_get_ext_d2i(x509, forIssuer ? NID_issuer_alt_name : NID_subject_alt_name, NULL, NULL));
+        GENERAL_NAMES* altNames = (GENERAL_NAMES*)
+            X509_get_ext_d2i(x509, forIssuer ? NID_issuer_alt_name : NID_subject_alt_name, NULL, NULL);
 
         if (altNames)
         {
@@ -652,13 +652,13 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue
                     {
                         BIO* b = BIO_new(BIO_s_mem());
                         ASN1_STRING_print_ex(b, str, ASN1_STRFLGS_UTF8_CONVERT);
-                        sk_GENERAL_NAME_free(altNames);
+                        GENERAL_NAMES_free(altNames);
                         return b;
                     }
                 }
             }
 
-            sk_GENERAL_NAME_free(altNames);
+            GENERAL_NAMES_free(altNames);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -593,8 +593,8 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue`
`593`	`593`	`break;`
`594`	`594`	`}`
`595`	`595`
`596`		`- STACK_OF(GENERAL_NAME)* altNames = (STACK_OF(GENERAL_NAME)*)(`
`597`		`- X509_get_ext_d2i(x509, forIssuer ? NID_issuer_alt_name : NID_subject_alt_name, NULL, NULL));`
	`596`	`+ GENERAL_NAMES* altNames = (GENERAL_NAMES*)`
	`597`	`+ X509_get_ext_d2i(x509, forIssuer ? NID_issuer_alt_name : NID_subject_alt_name, NULL, NULL);`
`598`	`598`
`599`	`599`	`if (altNames)`
`600`	`600`	`{`
`@@ -652,13 +652,13 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue`
`652`	`652`	`{`
`653`	`653`	`BIO* b = BIO_new(BIO_s_mem());`
`654`	`654`	`ASN1_STRING_print_ex(b, str, ASN1_STRFLGS_UTF8_CONVERT);`
`655`		`- sk_GENERAL_NAME_free(altNames);`
	`655`	`+ GENERAL_NAMES_free(altNames);`
`656`	`656`	`return b;`
`657`	`657`	`}`
`658`	`658`	`}`
`659`	`659`	`}`
`660`	`660`
`661`		`- sk_GENERAL_NAME_free(altNames);`
	`661`	`+ GENERAL_NAMES_free(altNames);`
`662`	`662`	`}`
`663`	`663`	`}`
`664`	`664`