Changeset 5917859c in mainline

Timestamp:

2011-10-14T22:55:09Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

49bd7ae2

Parents:

aaf835d

Message:

libusbdev: Fix uninitialized pipes_count if there are no interfaces.

Make asserts more meaningful.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (2 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -333 +333 @@
         int rc;
 
-        size_t pipe_count = count_other_pipes(endpoints);
+        const size_t pipe_count = count_other_pipes(endpoints);
         if (pipe_count == 0) {
+                *pipes_count_ptr = pipe_count;
                 *pipes_ptr = NULL;
                 return EOK;
@@ -445 +446 @@
 {
         assert(dev != NULL);
-        assert(((pipes != NULL) && (pipes_count > 0))
-            || ((pipes == NULL) && (pipes_count == 0)));
 
         if (pipes_count == 0) {
+                assert(pipes == NULL);
                 return EOK;
         }
+        assert(pipes != NULL);
 
         int rc;