1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

avoid other efforts if memory mapping fails

This commit is contained in:
Anatol Belski
2016-08-18 15:58:33 +02:00
parent 91cd55e32a
commit 98d8794eae

View File

@@ -671,10 +671,6 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
return (void*)-1;
}
shm->descriptor->shm_atime = time(NULL);
shm->descriptor->shm_lpid = getpid();
shm->descriptor->shm_nattch++;
shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
err = GetLastError();
@@ -686,6 +682,10 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
return (void*)-1;
}
shm->descriptor->shm_atime = time(NULL);
shm->descriptor->shm_lpid = getpid();
shm->descriptor->shm_nattch++;
return shm->addr;
}