Changeset 37b4794e in mainline for uspace/lib/usb/src/request.c

Timestamp:

2011-02-25T12:18:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0e3505a

Parents:

11f1817

Message:

More precise range checking with USB string index

File:

• uspace/lib/usb/src/request.c (modified) (2 diffs)

uspace/lib/usb/src/request.c

@@ -502 +502 @@
  *
  * @param[in] pipe Control endpoint pipe (session must be already started).
- * @param[in] index String index (in native endianess).
+ * @param[in] index String index (in native endianess),
+ *      first index has number 1 (index from descriptors can be used directly).
  * @param[in] lang String language (in native endianess).
  * @param[out] string_ptr Where to store allocated string in native encoding.
@@ -513 +514 @@
                 return EBADMEM;
         }
-        /* Index is actually one byte value. */
-        if (index > 0xFF) {
+        /*
+         * Index is actually one byte value and zero index is used
+         * to retrieve list of supported languages.
+         */
+        if ((index < 1) || (index > 0xFF)) {
                 return ERANGE;
         }