wolfSSL_ASN1_item_i2d: simplify buf cleanup

julek-wolfssl · julek-wolfssl · commit da9dc821e44a · 2026-03-06T12:03:46.000+01:00
F-25
diff --git a/src/ssl_asn1.c b/src/ssl_asn1.c
@@ -395,7 +395,6 @@ int wolfSSL_ASN1_item_i2d(const void* obj, byte** dest,
 {
     int ret = 1;
     int len = 0;
-    byte* buf = NULL;
 
     WOLFSSL_ENTER("wolfSSL_ASN1_item_i2d");
 
@@ -408,6 +407,7 @@ int wolfSSL_ASN1_item_i2d(const void* obj, byte** dest,
         ret = 0;
 
     if ((ret == 1) && (dest != NULL)) {
+        byte* buf = NULL;
         if (*dest == NULL) {
             buf = (byte*)XMALLOC((size_t)len, NULL, DYNAMIC_TYPE_ASN1);
             if (buf == NULL)
@@ -428,11 +428,11 @@ int wolfSSL_ASN1_item_i2d(const void* obj, byte** dest,
             else
                 *dest += len;
         }
+        if (*dest == NULL)
+            XFREE(buf, NULL, DYNAMIC_TYPE_ASN1);
     }
 
     if (ret == 0) {
-        if (*dest == NULL)
-            XFREE(buf, NULL, DYNAMIC_TYPE_ASN1);
         len = WOLFSSL_FATAL_ERROR;
     }
     WOLFSSL_LEAVE("wolfSSL_ASN1_item_i2d", len);

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,6 @@ int wolfSSL_ASN1_item_i2d(const void* obj, byte** dest,`
`395`	`395`	`{`
`396`	`396`	`int ret = 1;`
`397`	`397`	`int len = 0;`
`398`		`- byte* buf = NULL;`
`399`	`398`
`400`	`399`	`WOLFSSL_ENTER("wolfSSL_ASN1_item_i2d");`
`401`	`400`
`@@ -408,6 +407,7 @@ int wolfSSL_ASN1_item_i2d(const void* obj, byte** dest,`
`408`	`407`	`ret = 0;`
`409`	`408`
`410`	`409`	`if ((ret == 1) && (dest != NULL)) {`
	`410`	`+ byte* buf = NULL;`
`411`	`411`	`if (*dest == NULL) {`
`412`	`412`	`buf = (byte*)XMALLOC((size_t)len, NULL, DYNAMIC_TYPE_ASN1);`
`413`	`413`	`if (buf == NULL)`
`@@ -428,11 +428,11 @@ int wolfSSL_ASN1_item_i2d(const void* obj, byte** dest,`
`428`	`428`	`else`
`429`	`429`	`*dest += len;`
`430`	`430`	`}`
	`431`	`+ if (*dest == NULL)`
	`432`	`+ XFREE(buf, NULL, DYNAMIC_TYPE_ASN1);`
`431`	`433`	`}`
`432`	`434`
`433`	`435`	`if (ret == 0) {`
`434`		`- if (*dest == NULL)`
`435`		`- XFREE(buf, NULL, DYNAMIC_TYPE_ASN1);`
`436`	`436`	`len = WOLFSSL_FATAL_ERROR;`
`437`	`437`	`}`
`438`	`438`	`WOLFSSL_LEAVE("wolfSSL_ASN1_item_i2d", len);`