diff options
| author | Anatol Belski <ab@php.net> | 2017-04-15 18:29:37 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-15 18:29:37 +0200 |
| commit | 871ea20e9ca76510366840cd44fc330dc9cd8a40 (patch) | |
| tree | ddd2f46d63c4ab753f8fd2af22884b9e5befa819 /TSRM/tsrm_win32.c | |
| parent | 28218b4acc9c8271300f514e8b9ec08d6b9c482d (diff) | |
| parent | 5bd0baa89193c99e36a957f91e10977c3b3664b4 (diff) | |
| download | php-git-871ea20e9ca76510366840cd44fc330dc9cd8a40.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
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 0a29978628..84d153956e 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -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) { shm_pair *shm = shm_get(key, NULL); - int err; if (!shm->segment) { 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); - err = GetLastError(); - if (err) { + if (NULL == shm->addr) { + int err = GetLastError(); SET_ERRNO_FROM_WIN32_CODE(err); return (void*)-1; } |