diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-15 09:24:07 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-15 09:24:07 +0200 |
| commit | 4631b4e8135f443e7d5e6238c2a3a2b504677da8 (patch) | |
| tree | b1d347e4ce3d209900b5463c19dd26e24e6e40a1 /win32 | |
| parent | 2393692937a57b8b53adee37feb59a5f9d25254a (diff) | |
| parent | 8c6d006b55bf5ba230dda672344dbd0e2a7d4be3 (diff) | |
| download | php-git-4631b4e8135f443e7d5e6238c2a3a2b504677da8.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79557: extension_dir = ./ext now use current directory for base
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/winutil.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/win32/winutil.c b/win32/winutil.c index 7da505b1b4..a886964bf0 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -438,7 +438,13 @@ PHP_WINUTIL_API char *php_win32_get_username(void) static zend_always_inline BOOL is_compatible(const char *name, BOOL is_smaller, char *format, char **err) {/*{{{*/ - PLOADED_IMAGE img = ImageLoad(name, NULL); + /* work around ImageLoad() issue */ + char *name_stripped = name; + if (name[0] == '.' && IS_SLASH(name[1])) { + name_stripped += 2; + } + + PLOADED_IMAGE img = ImageLoad(name_stripped, NULL); if (!img) { DWORD _err = GetLastError(); |