MFH: - Fixed bug #25372 (sscanf() does not work with %X)

diff --git a/NEWS b/NEWS
index fecae60bf4b830a996471f71409a029e005e0f90..8bf3e68fb47c165fe64cfbd5315149b3b212a2be 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP 4                                                                      NEWS
 - Fixed disk_total_space() and disk_free_space() under FreeBSD. (Jon Parise)
 - Fixed crash bug when non-existing save/serializer handler was used. (Jani)
 - Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
+- Fixed bug #25372 (sscanf() does not work with %X). (Jani)
 - Fixed bug #25348 ("make install" fails with --enable-short-tags). (Jani)
 - Fixed bug #25343 (is_dir() gives warning on FreeBSD). (Jani)
 - Fixed bug #25308 (php -m crashes when zend extensions are loaded). (Stas)

diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index 542d2c5b73bde169287d1ffbef60221d03d2faca..fe4bc3ef1443065842731a1cd6bc8a5e379ed588 100644 (file)
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -789,6 +789,7 @@ PHPAPI int php_sscanf_internal(     char *string, char *format,
                 fn = (long (*)())strtol;
                 break;
             case 'x':
+            case 'X':
                 op = 'i';
                 base = 16;
                 fn = (long (*)())strtol;