diff options
| author | Anatol Belski <ab@php.net> | 2017-04-15 18:14:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-15 18:19:33 +0200 |
| commit | 9719621e078e41aa2d387cea4d4b1dd956c9e1e2 (patch) | |
| tree | 58e66abda8967265d574aa711ebb39328b025eec /TSRM/tsrm_win32.c | |
| parent | e433c23b96e81340cd0e2d0b4b7f5fce7f72a931 (diff) | |
| download | php-git-9719621e078e41aa2d387cea4d4b1dd956c9e1e2.tar.gz | |
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 f19da4c6dc..9c5fe55190 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -671,7 +671,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; @@ -679,8 +678,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(); /* Catch more errors */ if (ERROR_NOT_ENOUGH_MEMORY == err) { _set_errno(ENOMEM); |