php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Implement stricter CRT check
This commit is contained in:
Anatol Belski
2019-03-31 17:34:06 +02:00
parent a58882be6c dd0aca0c11
commit 4e4bb56d6c
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/main.c
View File

@@ -2161,6 +2161,16 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
#endif
#ifdef PHP_WIN32
# if PHP_LINKER_MAJOR == 14
/* Extend for other CRT if needed. */
char *img_err;
if (!php_win32_crt_compatible("vcruntime140.dll", &img_err)) {
php_error(E_CORE_WARNING, img_err);
efree(img_err);
return FAILURE;
}
# endif
/* start up winsock services */
if (WSAStartup(wVersionRequested, &wsaData) != 0) {
php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError());

38
win32/winutil.c
View File

@@ -460,7 +460,7 @@ PHP_WINUTIL_API BOOL php_win32_image_compatible(const char *name, const char *pa
per the current knowledge.
This check is to be extended as new VS versions come out. */
if (14 == major && PHP_LINKER_MINOR < minor
if (14 == PHP_LINKER_MAJOR && 14 == major && PHP_LINKER_MINOR < minor
|| PHP_LINKER_MAJOR != major) {
spprintf(err, 0, "Can't load module '%s' as it's linked with %u.%u, but the core is linked with %d.%d", name, major, minor, PHP_LINKER_MAJOR, PHP_LINKER_MINOR);
ImageUnload(img);
@@ -472,3 +472,39 @@ PHP_WINUTIL_API BOOL php_win32_image_compatible(const char *name, const char *pa
return TRUE;
}/*}}}*/
/* Expect a CRT name DLL. */
PHP_WINUTIL_API BOOL php_win32_crt_compatible(const char *name, char **err)
{/*{{{*/
PLOADED_IMAGE img = ImageLoad(name, NULL);
if (!img) {
DWORD _err = GetLastError();
char *err_txt = php_win32_error_to_msg(_err);
spprintf(err, 0, "Failed to load %s, %s", name, err_txt);
free(err_txt);
return FALSE;
}
DWORD major = img->FileHeader->OptionalHeader.MajorLinkerVersion;
DWORD minor = img->FileHeader->OptionalHeader.MinorLinkerVersion;
#if PHP_LINKER_MAJOR == 14
DWORD core_minor = (DWORD)(PHP_LINKER_MINOR/10);
DWORD comp_minor = (DWORD)(minor/10);
if (core_minor > comp_minor) {
spprintf(err, 0, "'%s' %u.%u is not compatible with this PHP build linked with %d.%d", name, major, minor, PHP_LINKER_MAJOR, PHP_LINKER_MINOR);
ImageUnload(img);
return FALSE;
}
#else
if (PHP_LINKER_MAJOR != major) {
spprintf(err, 0, "'%s' %u.%u is not compatible with this PHP build linked with %d.%d", name, major, minor, PHP_LINKER_MAJOR, PHP_LINKER_MINOR);
ImageUnload(img);
return FALSE;
}
#endif
ImageUnload(img);
return TRUE;
}/*}}}*/

1
win32/winutil.h
View File

@@ -56,5 +56,6 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err);
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_crt_compatible(const char *img, char **err);
#endif