From 195c2008e8f25040130e597f46cd652829c84dba Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 8 Oct 2019 12:09:11 +0200 Subject: [PATCH] Fix #78642: Wrong libiconv version displayed The high byte of `_libiconv_version` specifies the major version; the low byte the minor version. --- NEWS | 3 +++ ext/iconv/iconv.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3b26acca5f..d2056ad45d 100644 --- a/NEWS +++ b/NEWS @@ -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 -- 2.49.0