Changeset 0c07d70 in mainline

Timestamp:

2011-05-30T15:21:09Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4708657

Parents:

9843942 (diff), 0dd3e49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with usb/development

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 {