Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix error handling

diff --cc TSRM/tsrm_win32.c
index df066443dd037e985e37bcdf3e6b1fe70e1f153a,9c5fe5519033176268a905ab33a4fdb3ceedffa4..1023829b694cd0d2abea869e11b93328be0651f4
--- 1/TSRM/tsrm_win32.c
--- 2/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@@ -729,9 -678,12 +728,9 @@@ TSRM_API void *shmat(int key, const voi
  
        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);
 -              }
 +              SET_ERRNO_FROM_WIN32_CODE(err);
                return (void*)-1;
        }