Fix #78642: Wrong libiconv version displayed

cmb69 · cmb69 · commit 195c2008e8f2 · 2019-10-08T12:09:11.000+02:00
The high byte of `_libiconv_version` specifies the major version; the
low byte the minor version.
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ PHP_MINIT_FUNCTION(miconv)`
`286`	`286`	`{`
`287`	`287`	`static char buf[16];`
`288`	`288`	`snprintf(buf, sizeof(buf), "%d.%d",`
`289`		`- ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f));`
	`289`	`+ _libiconv_version >> 8, _libiconv_version & 0xff);`
`290`	`290`	`version = buf;`
`291`	`291`	`}`
`292`	`292`	`#elif HAVE_GLIBC_ICONV`