Changeset 12e689f in mainline

Timestamp:

2012-02-24T05:37:19Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

48f0f73a

Parents:

7f7e6f5

Message:

libusbdev: Do not modify retrieved descriptors, compute required value explicitly.

There might be more such values and we won't convert all.

File:

• uspace/lib/usbdev/src/request.c (modified) (5 diffs)

uspace/lib/usbdev/src/request.c

@@ -435 +435 @@
         /* Everything is okay, copy the descriptor. */
         memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
-        descriptor->total_length = uint16_usb2host(descriptor_tmp.total_length);
         return EOK;
 }
@@ -495 +494 @@
                 return ENOENT;
         }
-        if (bare_config.total_length < sizeof(bare_config)) {
+
+        const size_t total_length = uint16_usb2host(bare_config.total_length);
+        if (total_length < sizeof(bare_config)) {
                 return ELIMIT;
         }
 
-        void *buffer = malloc(bare_config.total_length);
+        void *buffer = malloc(total_length);
         if (buffer == NULL) {
                 return ENOMEM;
@@ -506 +507 @@
         size_t transferred = 0;
         rc = usb_request_get_full_configuration_descriptor(pipe, index,
-            buffer, bare_config.total_length, &transferred);
+            buffer, total_length, &transferred);
         if (rc != EOK) {
                 free(buffer);
@@ -512 +513 @@
         }
 
-        if (transferred != bare_config.total_length) {
+        if (transferred != total_length) {
                 free(buffer);
                 return ELIMIT;
@@ -522 +523 @@
 
         if (descriptor_size != NULL) {
-                *descriptor_size = bare_config.total_length;
+                *descriptor_size = total_length;
         }