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

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  fix error handling
This commit is contained in:
Anatol Belski 2017-04-15 18:29:37 +02:00
commit 871ea20e9c
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TSRM/tsrm_win32.c
View file

@ -725,7 +725,6 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
TSRM_API void *shmat(int key, const void *shmaddr, int flags) TSRM_API void *shmat(int key, const void *shmaddr, int flags)
{ {
shm_pair *shm = shm_get(key, NULL); shm_pair *shm = shm_get(key, NULL);
int err;
if (!shm->segment) { if (!shm->segment) {
return (void*)-1; return (void*)-1;
@ -733,8 +732,8 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL); shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
err = GetLastError(); if (NULL == shm->addr) {
if (err) { int err = GetLastError();
SET_ERRNO_FROM_WIN32_CODE(err); SET_ERRNO_FROM_WIN32_CODE(err);
return (void*)-1; return (void*)-1;
} }