Core: Fix incorrect reference counting of default context when first created.

* See http://libusbx.1081486.n5.nabble.com/Libusbx-devel-stress-program-crashes-in-libusb-exit-NULL-tp474p477.html

diff --git a/libusb/core.c b/libusb/core.c
index 07b0b04..729bce3 100644 (file)
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -1655,6 +1655,7 @@ int API_EXPORTED libusb_init(libusb_context **context)
        /* default context should be initialized before calling usbi_dbg */
        if (!usbi_default_context) {
                usbi_default_context = ctx;
+               default_context_refcnt++;
                usbi_dbg("created default context");
        }
 
@@ -1681,10 +1682,6 @@ int API_EXPORTED libusb_init(libusb_context **context)
 
        if (context) {
                *context = ctx;
-       } else if (!usbi_default_context) {
-               usbi_dbg("created default context");
-               usbi_default_context = ctx;
-               default_context_refcnt++;
        }
        usbi_mutex_static_unlock(&default_context_lock);
 

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index ef6b500..27680c6 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10589
+#define LIBUSB_NANO 10590