summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2018-07-09 00:54:36 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2018-07-09 00:54:36 +0200
commit1c01b1ab48ced6911993d958d06fefbbf39bca19 (patch)
tree6feb5e6131a74d0e4dec60e9208da203c19d2bc0
parentd664d1e9592ad923ce8656201cb6f85f87ed394c (diff)
downloadphp-git-1c01b1ab48ced6911993d958d06fefbbf39bca19.tar.gz
Fix #76594: Bus Error due to unaligned access in zend_ini.c OnUpdateLong
Since commit ea83b69[1] changed the type of mbstring.strict_detection from `long` to `zend_bool`, we have to update the `on_modify` callback as well. [1] http://git.php.net/?p=php-src.git;a=commit;h=ea83b69883f3f77fd27e4663fa854c88f141ab41
-rw-r--r--NEWS4
-rw-r--r--ext/mbstring/mbstring.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4be623ce70..851373d4d0 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ PHP NEWS
incorrectly) - added new log related FPM configuration options:
log_limit, log_buffering and decorate_workers_output. (Jakub Zelenka)
+- mbstring:
+ . Fixed bug #76594 (Bus Error due to unaligned access in zend_ini.c
+ OnUpdateLong). (cmb, Nikita)
+
- PDO_Firebird:
. Fixed bug #74462 (PDO_Firebird returns only NULLs for results with boolean
for FIREBIRD >= 3.0). (Dorin Marcoci)
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 01c070b584..c3843d7963 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1502,7 +1502,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("mbstring.strict_detection", "0",
PHP_INI_ALL,
- OnUpdateLong,
+ OnUpdateBool,
strict_detection, zend_mbstring_globals, mbstring_globals)
PHP_INI_END()
/* }}} */