drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: POSIX msg queues: destroy msg queue fhandler in case of error 

...and don't leave a descriptor dangling

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-05-21 15:26:51 +02:00
parent 723f38b10a
commit bce3563e98
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/posix_ipc.cc
View File

@ -392,7 +392,6 @@ mq_open (const char *name, int oflag, ...)
fh = (fhandler_mqueue *) build_fh_dev (*mqueue_dev, name); fh = (fhandler_mqueue *) build_fh_dev (*mqueue_dev, name);
if (!fh) if (!fh)
__leave; __leave;
fdm = fh;
mqinfo = fh->mqinfo_create ((HANDLE) _get_osfhandle (fd), filesize, mqinfo = fh->mqinfo_create ((HANDLE) _get_osfhandle (fd), filesize,
mode, nonblock); mode, nonblock);
@ -426,6 +425,7 @@ mq_open (const char *name, int oflag, ...)
if (fchmod (fd, mode) == -1) if (fchmod (fd, mode) == -1)
__leave; __leave;
close (fd); close (fd);
fdm = fh;
return (mqd_t) fdm; return (mqd_t) fdm;
} }
@ -468,7 +468,6 @@ mq_open (const char *name, int oflag, ...)
fh = (fhandler_mqueue *) build_fh_dev (*mqueue_dev, name); fh = (fhandler_mqueue *) build_fh_dev (*mqueue_dev, name);
if (!fh) if (!fh)
__leave; __leave;
fdm = fh;
mqinfo = fh->mqinfo_open ((HANDLE) _get_osfhandle (fd), statbuff.st_size, mqinfo = fh->mqinfo_open ((HANDLE) _get_osfhandle (fd), statbuff.st_size,
statbuff.st_mode, nonblock); statbuff.st_mode, nonblock);
@ -476,6 +475,7 @@ mq_open (const char *name, int oflag, ...)
__leave; __leave;
close (fd); close (fd);
fdm = fh;
return (mqd_t) fdm; return (mqd_t) fdm;
} }
__except (EFAULT) {} __except (EFAULT) {}
@ -486,6 +486,11 @@ mq_open (const char *name, int oflag, ...)
unlink (mqname); unlink (mqname);
if (fd >= 0) if (fd >= 0)
close (fd); close (fd);
if (fh)
{
fh->close ();
delete fh;
}
return (mqd_t) -1; return (mqd_t) -1;
} }