Changeset e6503e9 in mainline

Timestamp:

2011-05-31T19:54:33Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

61ebd99b, c3dafe1

Parents:

50340bf

Message:

Fix bad pointer iteration

File:

• uspace/app/vuhid/device.c (modified) (4 diffs)

uspace/app/vuhid/device.c

@@ -96 +96 @@
     const char *id)
 {
-        vuhid_interface_t *iface = ifaces[0];
-        while (iface != NULL) {
-                if (str_cmp(iface->id, id) == 0) {
-                        return iface;
+        if ((ifaces == NULL) || (id == NULL)) {
+                return NULL;
+        }
+        while (*ifaces != NULL) {
+                if (str_cmp((*ifaces)->id, id) == 0) {
+                        return *ifaces;
                 }
-                iface++;
-        }
-
-        return iface;
+                ifaces++;
+        }
+
+        return NULL;
 }
 
@@ -119 +121 @@
         }
 
-        // FIXME - we shall set vuhid_data to NULL in the main() rather
-        // than to depend on individual interfaces
         /* Already used interface. */
         if (iface->vuhid_data != NULL) {
@@ -166 +166 @@
          * Prepare new descriptors.
          */
-        printf("preparing descriptors...\n");
         size_t descr_count = 0;
         size_t total_descr_size = 0;
@@ -273 +272 @@
         }
 
-        printf("adding extra descriptors...\n");
         /* Allocation is okay, we can (actually have to now) overwrite the
          * original pointer.