From 195c2008e8f25040130e597f46cd652829c84dba Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 8 Oct 2019 12:09:11 +0200 Subject: Fix #78642: Wrong libiconv version displayed The high byte of `_libiconv_version` specifies the major version; the low byte the minor version. --- ext/iconv/iconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/iconv') 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 -- cgit v1.2.1