archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix signature and calls

Browse source
This commit is contained in:
Anatol Belski 2019-08-27 14:34:14 +02:00
parent 78e0f85cb5
commit 9b5d66bd52
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/dl.c
View file

@ -168,7 +168,7 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
} }
#ifdef PHP_WIN32 #ifdef PHP_WIN32
if (!php_win32_image_compatible(libpath, NULL, &err1)) { if (!php_win32_image_compatible(libpath, &err1)) {
php_error_docref(NULL, error_type, err1); php_error_docref(NULL, error_type, err1);
efree(err1); efree(err1);
efree(libpath); efree(libpath);

4
main/php_ini.c
View file

@ -341,7 +341,7 @@ static void php_load_zend_extension_cb(void *arg)
if (IS_ABSOLUTE_PATH(filename, length)) { if (IS_ABSOLUTE_PATH(filename, length)) {
#ifdef PHP_WIN32 #ifdef PHP_WIN32
char *err; char *err;
if (!php_win32_image_compatible(filename, NULL, &err)) { if (!php_win32_image_compatible(filename, &err)) {
php_error(E_CORE_WARNING, err); php_error(E_CORE_WARNING, err);
return; return;
} }
@ -392,7 +392,7 @@ static void php_load_zend_extension_cb(void *arg)
} }
#ifdef PHP_WIN32 #ifdef PHP_WIN32
if (!php_win32_image_compatible(libpath, NULL, &err1)) { if (!php_win32_image_compatible(libpath, &err1)) {
php_error(E_CORE_WARNING, err1); php_error(E_CORE_WARNING, err1);
efree(err1); efree(err1);
efree(libpath); efree(libpath);

2
win32/winutil.h
View file

@ -55,7 +55,7 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err);
PHP_WINUTIL_API char *php_win32_get_username(void); PHP_WINUTIL_API char *php_win32_get_username(void);
PHP_WINUTIL_API BOOL php_win32_image_compatible(const char *img, const char *path, char **err); PHP_WINUTIL_API BOOL php_win32_image_compatible(const char *img, char **err);
PHP_WINUTIL_API BOOL php_win32_crt_compatible(const char *img, char **err); PHP_WINUTIL_API BOOL php_win32_crt_compatible(const char *img, char **err);
#endif #endif