RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-07-21 00:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

io: Fix memory leaks in usbi_io_init()

Browse Source 
* If the hotplug pipe failed to be created, the usbi_pollfd for the
  control pipe was being leaked.
* If the usbi_pollfd for timerfd failed to be added, the usbi_pollfd
  for the hotplug pipe was being leaked.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
This commit is contained in:
Chris Dickens
2014-08-26 23:36:12 -07:00
parent a0d37149dc
commit b72f4cf77e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libusb/io.c
+8 -3
View File
@@ -1134,7 +1134,7 @@ int usbi_io_init(struct libusb_context *ctx)
r = usbi_pipe(ctx->hotplug_pipe);
if (r < 0) {
r = LIBUSB_ERROR_OTHER;
goto err;
goto err_remove_pipe;
}
r = usbi_add_pollfd(ctx, ctx->hotplug_pipe[0], POLLIN);
@@ -1148,9 +1148,8 @@ int usbi_io_init(struct libusb_context *ctx)
usbi_dbg("using timerfd for timeouts");
r = usbi_add_pollfd(ctx, ctx->timerfd, POLLIN);
if (r < 0) {
usbi_remove_pollfd(ctx, ctx->ctrl_pipe[0]);
close(ctx->timerfd);
goto err_close_hp_pipe;
goto err_remove_hp_pipe;
}
} else {
usbi_dbg("timerfd not available (code %d error %d)", ctx->timerfd, errno);
@@ -1160,9 +1159,15 @@ int usbi_io_init(struct libusb_context *ctx)
return 0;
#ifdef USBI_TIMERFD_AVAILABLE
err_remove_hp_pipe:
usbi_remove_pollfd(ctx, ctx->hotplug_pipe[0]);
#endif
err_close_hp_pipe:
usbi_close(ctx->hotplug_pipe[0]);
usbi_close(ctx->hotplug_pipe[1]);
err_remove_pipe:
usbi_remove_pollfd(ctx, ctx->ctrl_pipe[0]);
err_close_pipe:
usbi_close(ctx->ctrl_pipe[0]);
usbi_close(ctx->ctrl_pipe[1]);
libusb/version_nano.h
+1 -1
View File
@@ -1 +1 @@
#define LIBUSB_NANO 10916
#define LIBUSB_NANO 10917