From: Anatol Belski <ab@php.net>
Date: Sat, 15 Apr 2017 16:25:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bd0baa89193c99e36a957f91e10977c3b3664b4;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix error handling
---

5bd0baa89193c99e36a957f91e10977c3b3664b4
diff --cc TSRM/tsrm_win32.c
index df066443dd,9c5fe55190..1023829b69
--- a/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;
  	}