mbstring: fix memory leak at updating current_detect_order_list

Tobias Vorwachs · Tobias Vorwachs · commit d8471afd1baa · 2025-11-18T17:15:27.000+01:00
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -5984,6 +5984,11 @@ static void php_mb_populate_current_detect_order_list(void)
 			entry[i] = mbfl_no2encoding(src[i]);
 		}
 	}
+
+	if (MBSTRG(current_detect_order_list) != NULL) {
+		efree(ZEND_VOIDP(MBSTRG(current_detect_order_list)));
+	}
+
 	MBSTRG(current_detect_order_list) = entry;
 	MBSTRG(current_detect_order_list_size) = nentries;
 }

Original file line number	Diff line number	Diff line change
`@@ -5984,6 +5984,11 @@ static void php_mb_populate_current_detect_order_list(void)`
`5984`	`5984`	`entry[i] = mbfl_no2encoding(src[i]);`
`5985`	`5985`	`}`
`5986`	`5986`	`}`
	`5987`	`+`
	`5988`	`+ if (MBSTRG(current_detect_order_list) != NULL) {`
	`5989`	`+ efree(ZEND_VOIDP(MBSTRG(current_detect_order_list)));`
	`5990`	`+ }`
	`5991`	`+`
`5987`	`5992`	`MBSTRG(current_detect_order_list) = entry;`
`5988`	`5993`	`MBSTRG(current_detect_order_list_size) = nentries;`
`5989`	`5994`	`}`