Core: Filter out 8-bit characters in libusb_get_string_descriptor_ascii

* Closes #68

diff --git a/AUTHORS b/AUTHORS
index 8c15bd5..c80f5fa 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,3 +48,4 @@ Uri Lublin
 Vasily Khoruzhick
 Vitali Lovich
 Xiaofan Chen
+Роман Донченко

diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index f3a4132..7e47aae 100644 (file)
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -734,7 +734,7 @@ int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
                if (di >= (length - 1))
                        break;
 
-               if (tbuf[si + 1]) /* high byte */
+               if ((tbuf[si] & 0x80) || (tbuf[si + 1])) /* non-ASCII */
                        data[di++] = '?';
                else
                        data[di++] = tbuf[si];

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 7ef9604..4a236d7 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10591
+#define LIBUSB_NANO 10592