diff options
| author | winterrace <hauptadmin@gmail.com> | 2019-08-20 23:34:00 +0200 |
|---|---|---|
| committer | Nathan Hjelm <hjelmn@google.com> | 2019-08-21 21:05:57 -0700 |
| commit | 43ae426488e4d049fc55b08ad3f70cc249d0f98f (patch) | |
| tree | b1940e0594be080b906d942e51ac6dd501eefbbf | |
| parent | 4b94eeddadf46cd046acef4e36969d97ab4bb31a (diff) | |
| download | libusb-43ae426488e4d049fc55b08ad3f70cc249d0f98f.tar.gz | |
Fix NULL pointer dereference crashes
Signed-off-by: Nathan Hjelm <hjelmn@google.com>
| -rw-r--r-- | libusb/os/poll_windows.c | 4 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c index 5282e7d..c8eff81 100644 --- a/libusb/os/poll_windows.c +++ b/libusb/os/poll_windows.c @@ -71,8 +71,8 @@ static void usbi_dec_fd_table() static void smart_realloc_fd_table_space(int inc) { - if (fd_count + inc > fd_size) { - struct file_descriptor **p = (struct file_descriptor *)realloc(fd_table, (fd_size + INC_FDS_EACH) * sizeof(struct file_descriptor *)); + if (fd_table == NULL || fd_count + inc > fd_size) { + struct file_descriptor **p = (struct file_descriptor **)realloc(fd_table, (fd_size + INC_FDS_EACH) * sizeof(struct file_descriptor *)); if (p != NULL) { memset(p + fd_size, 0, INC_FDS_EACH * sizeof(struct file_descriptor *)); fd_size += INC_FDS_EACH; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 9447804..8dc8177 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11394 +#define LIBUSB_NANO 11395 |