Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Modules / USB / Core / usb_lowlevel.c

diff --git a/Modules/USB/Core/usb_lowlevel.c b/Modules/USB/Core/usb_lowlevel.c
index 65365d3..0e53bad 100644 (file)
--- a/Modules/USB/Core/usb_lowlevel.c
+++ b/Modules/USB/Core/usb_lowlevel.c
@@ -122,8 +122,15 @@ char *USB_int_GetDeviceString(tUSBDevice *Dev, int Endpoint, int Index)
        struct sDescriptor_String       str;
         int    src_len, new_len;
        char    *ret;
+
+       if(Index == 0)  return strdup("");
        
        USB_int_ReadDescriptor(Dev, Endpoint, 3, Index, sizeof(str), &str);
+       if(str.Length < 2) {
+               Log_Error("USB", "String %p:%i:%i:%i descriptor is undersized (%i)",
+                       Dev->Host, Dev->Address, Endpoint, Index, str.Length);
+               return NULL;
+       }
 //     if(str.Length > sizeof(str)) {
 //             // IMPOSSIBLE!
 //             Log_Error("USB", "String is %i bytes, which is over prealloc size (%i)",