Skip to content

Properly handle shmget() ENOMEM error conditions on Windows #9748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −2
Open

Properly handle shmget() ENOMEM error conditions on Windows #9748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0d3837
Properly handle shmget() ENOMEM error conditions on Windows
cmb69 Oct 14, 2022
b9a14f6
Properly close shm->segment
cmb69 Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions TSRM/tsrm_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,13 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
}
shm->segment = shm_handle;
shm->descriptor = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
if (shm->descriptor == NULL) {
SET_ERRNO_FROM_WIN32_CODE(GetLastError());
CloseHandle(shm->segment);
return -1;
}

if (NULL != shm->descriptor && created) {
if (created) {
shm->descriptor->shm_perm.key = key;
shm->descriptor->shm_segsz = size;
shm->descriptor->shm_ctime = time(NULL);
Expand All @@ -709,7 +714,7 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
shm->descriptor->shm_perm.mode = shm->descriptor->shm_perm.seq = 0;
}

if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz) {
if (NULL != shm->segment) {
CloseHandle(shm->segment);
shm->segment = INVALID_HANDLE_VALUE;
Expand Down