Changeset 0dd3e49 in mainline

Timestamp:

2011-05-30T15:14:50Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

0c07d70, 3ae26a8, 55f324f

Parents:

2176ed6

Message:

find report description bug fix

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (1 diff)
• hidparser.c (modified) (1 diff)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -328 +328 @@
                 const usb_hid_report_t *report, uint8_t report_id,
                 usb_hid_report_type_t type) {
+
+        if(report == NULL) {
+                return NULL;
+        }
 
         link_t *report_it = report->reports.next;

uspace/lib/usbhid/src/hidparser.c

@@ -605 +605 @@
         
         if(report_id > 0) {
-                report_it = usb_hid_report_find_description(report, report_id, 
-                        type)->link.next;               
+                report_des = usb_hid_report_find_description(report, report_id, 
+                        type);
+                if(report_des == NULL) {
+                        return 0;
+                }
+                else {
+                        report_it = report_des->link.next;
+                }       
         }
         else {