diff options
| author | Anatol Belski <ab@php.net> | 2018-11-10 22:02:44 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-11-10 22:02:44 +0100 |
| commit | ee50461e4b33321d4bf8b8de33a08ce3e298ba2c (patch) | |
| tree | 5efd51a44606daf3725ec9ba8901f0d3e6ff4a74 | |
| parent | df9c58e27aa4922426d6ba1035d864e4c021ae56 (diff) | |
| download | php-git-ee50461e4b33321d4bf8b8de33a08ce3e298ba2c.tar.gz | |
Update libmagic.patch [ci skip]
| -rw-r--r-- | ext/fileinfo/libmagic.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index 2504789777..1e1fc08b03 100644 --- a/ext/fileinfo/libmagic.patch +++ b/ext/fileinfo/libmagic.patch @@ -3882,7 +3882,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c if (NOTMIME(ms)) { diff -u libmagic.orig/softmagic.c libmagic/softmagic.c --- libmagic.orig/softmagic.c 2018-04-15 20:49:15.000000000 +0200 -+++ libmagic/softmagic.c 2018-11-05 21:33:14.919371593 +0100 ++++ libmagic/softmagic.c 2018-11-10 12:18:21.864916065 +0100 @@ -43,6 +43,10 @@ #include <time.h> #include "der.h" @@ -3944,7 +3944,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c - if (rc) { - file_regerror(&rx, rc, ms); + (void)setlocale(LC_CTYPE, "C"); -+ pattern = zend_string_init("~%[-0-9.]*s~", sizeof("~%[-0-9.]*s~") - 1, 0); ++ pattern = zend_string_init("~%[-0-9\\.]*s~", sizeof("~%[-0-9\\.]*s~") - 1, 0); + if ((pce = pcre_get_compiled_regex(pattern, &capture_count, &re_options)) == NULL) { + rv = -1; } else { |