diff options
| author | Anatol Belski <ab@php.net> | 2017-04-15 18:25:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-15 18:25:31 +0200 |
| commit | 5bd0baa89193c99e36a957f91e10977c3b3664b4 (patch) | |
| tree | 680a9d3c8c1775189441e54eddf07f2aace56ea7 /TSRM/tsrm_win32.c | |
| parent | 2719b8e91cf3ebbaf7789a6d86ec35ae29928545 (diff) | |
| parent | 9719621e078e41aa2d387cea4d4b1dd956c9e1e2 (diff) | |
| download | php-git-5bd0baa89193c99e36a957f91e10977c3b3664b4.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix error handling
Diffstat (limited to 'TSRM/tsrm_win32.c')
| -rw-r--r-- | TSRM/tsrm_win32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index df066443dd..1023829b69 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -721,7 +721,6 @@ TSRM_API int shmget(int key, int size, int flags) TSRM_API void *shmat(int key, const void *shmaddr, int flags) { shm_pair *shm = shm_get(key, NULL); - int err; if (!shm->segment) { return (void*)-1; @@ -729,8 +728,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); - err = GetLastError(); - if (err) { + if (NULL == shm->addr) { + int err = GetLastError(); SET_ERRNO_FROM_WIN32_CODE(err); return (void*)-1; } |