diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:09:11 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:09:11 +0200 |
| commit | 195c2008e8f25040130e597f46cd652829c84dba (patch) | |
| tree | 4adc41ea6cae7b6e1b185448230536940d399a98 | |
| parent | 05d6878b3b687c3d1a8037e42a7050d309a74e17 (diff) | |
| download | php-git-195c2008e8f25040130e597f46cd652829c84dba.tar.gz | |
Fix #78642: Wrong libiconv version displayed
The high byte of `_libiconv_version` specifies the major version; the
low byte the minor version.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2019, PHP 7.2.25 +- Iconv: + . Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas, + cmb). 24 Oct 2019, PHP 7.2.24 diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 781985ce3e..12f8c90eaf 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -286,7 +286,7 @@ PHP_MINIT_FUNCTION(miconv) { static char buf[16]; snprintf(buf, sizeof(buf), "%d.%d", - ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f)); + _libiconv_version >> 8, _libiconv_version & 0xff); version = buf; } #elif HAVE_GLIBC_ICONV |