Changeset 8bec4d1 in mainline for uspace/lib/usb/src/hidparser.c

Timestamp:

2011-03-08T19:25:20Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

021351c, 60a228f

Parents:

3de529c

Message:

possible buffer overflow check fixed

File:

• uspace/lib/usb/src/hidparser.c (modified) (4 diffs)

uspace/lib/usb/src/hidparser.c

@@ -119 +119 @@
         }
         link_initialize(&(report_item->link));  
-        
+
         while(i<size){  
                 if(!USB_HID_ITEM_IS_LONG(data[i])){
 
-                        if((i+1) >= size){
+                        if((i+USB_HID_ITEM_SIZE(data[i]))>= size){
                                 return -1; // TODO ERROR CODE
                         }
@@ -200 +200 @@
         }
         
-
         return EOK;
 }
@@ -326 +325 @@
                 case USB_HID_REPORT_TAG_COLLECTION:
                         // TODO
+                        return USB_HID_NO_ACTION;
                         break;
                         
                 case USB_HID_REPORT_TAG_END_COLLECTION:
                         /* should be ignored */
+                        return USB_HID_NO_ACTION;
                         break;
                 default:
@@ -335 +336 @@
         }
 
-        return USB_HID_NO_ACTION;
+        return EOK;
 }