Changeset 69b9740 in mainline

Timestamp:

2011-11-28T17:14:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9dbfd288

Parents:

0255d36

Message:

libusbdev: Add to array end check to alternate interfaces initialization.

File:

• uspace/lib/usbdev/src/altiface.c (modified) (3 diffs)

uspace/lib/usbdev/src/altiface.c

@@ -127 +127 @@
         };
 
-        usb_alternate_interface_descriptors_t *cur_alt_iface
+        usb_alternate_interface_descriptors_t *iterator
             = &alternates->alternatives[0];
+
+        const usb_alternate_interface_descriptors_t *end
+            = &alternates->alternatives[alternates->alternative_count];
 
         const void *iface_ptr =
             usb_dp_get_nested_descriptor(&dp_parser, &dp_data, dp_data.data);
 
-        while (iface_ptr != NULL) {
+        while (iface_ptr != NULL && iterator < end) {
                 const usb_standard_interface_descriptor_t *iface = iface_ptr;
 
@@ -145 +148 @@
                 }
 
-                cur_alt_iface->interface = iface;
-                cur_alt_iface->nested_descriptors = iface_ptr + sizeof(*iface);
+                iterator->interface = iface;
+                iterator->nested_descriptors = iface_ptr + sizeof(*iface);
 
                 /* Find next interface to count size of nested descriptors. */
@@ -155 +158 @@
                     dp_data.data + dp_data.size : iface_ptr;
 
-                cur_alt_iface->nested_descriptors_size
-                    = next - cur_alt_iface->nested_descriptors;
+                iterator->nested_descriptors_size
+                    = next - iterator->nested_descriptors;
 
-                ++cur_alt_iface;
+                ++iterator;
         }