From ce01fb560759808ad6e7625099d75ae8ff9d7884 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date: Sat, 13 Dec 2025 15:08:45 +0100
Subject: [PATCH] Fix GH-20695: Assertion failure in normalize_value() when
 parsing malformed INI input via parse_ini_string()

I think there's simply a reasoning error about when which scanner state
can cause which parser component to invoke later on.
---
 Zend/zend_ini_scanner.l         |  2 +-
 ext/standard/tests/gh20695.phpt | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 ext/standard/tests/gh20695.phpt

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index b87f4e33cc8f8..b4013e8334f67 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -145,10 +145,10 @@ ZEND_API zend_ini_scanner_globals ini_scanner_globals;
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_TYPED &&            \
 		(YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW))) {\
 		zend_ini_copy_typed_value(ini_lval, type, str, len);       \
-		Z_EXTRA_P(ini_lval) = 0;                                   \
 	} else {                                                       \
 		zend_ini_copy_value(ini_lval, str, len);                   \
 	}                                                              \
+	Z_EXTRA_P(ini_lval) = 0;                                       \
 	return type;                                                   \
 }
 
diff --git a/ext/standard/tests/gh20695.phpt b/ext/standard/tests/gh20695.phpt
new file mode 100644
index 0000000000000..64c81ab9fdb54
--- /dev/null
+++ b/ext/standard/tests/gh20695.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-20695 (Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string())
+--FILE--
+<?php
+var_dump(parse_ini_string('8 [[] = !!$]', true, INI_SCANNER_TYPED));
+?>
+--EXPECT--
+array(1) {
+  [8]=>
+  array(1) {
+    ["["]=>
+    int(0)
+  }
+}