From: Antony Dovgal <tony2001@php.net>
Date: Tue, 20 Mar 2007 17:57:44 +0000 (+0000)
Subject: fix shmop_open() with IPC_CREAT|IPC_EXCL flags on win32
X-Git-Tag: RELEASE_1_0_1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44552ae4975235b87467647fe38a8a5c336e346b;p=php

fix shmop_open() with IPC_CREAT|IPC_EXCL flags on win32
---

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index b60be0cc9c..5a8983b5e4 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -280,9 +280,6 @@ TSRM_API int shmget(int key, int size, int flags)
 	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
 
 	if ((!shm_handle && !info_handle)) {
-		if (flags & IPC_EXCL) {
-			return -1;
-		}
 		if (flags & IPC_CREAT) {
 			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, shm_segment);
 			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
@@ -291,6 +288,10 @@ TSRM_API int shmget(int key, int size, int flags)
 		if ((!shm_handle || !info_handle)) {
 			return -1;
 		}
+	} else {
+		if (flags & IPC_EXCL) {
+			return -1;
+		}
 	}
 
 	shm = shm_get(key, NULL);