Changeset 4fe3b6d in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with development

File:

• uspace/lib/c/generic/devman.c (modified) (1 diff)

uspace/lib/c/generic/devman.c

@@ -415 +415 @@
         }
 
+        /* To be on the safe-side. */
         path[path_size - 1] = 0;
 
-        if (IPC_GET_ARG2(data_request_call) >= path_size) {
+        size_t transferred_size = IPC_GET_ARG2(data_request_call);
+
+        if (transferred_size >= path_size) {
                 return ELIMIT;
         }
+
+        /* Terminate the string (trailing 0 not send over IPC). */
+        path[transferred_size] = 0;
 
         return EOK;