Changeset 1d1bb0f in mainline for uspace/lib/c/generic/str.c

Timestamp:

2011-06-19T13:38:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b72efe8

Parents:

adfdbd5 (diff), 9724d7f (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 from ​https://code.launchpad.net/~vojtech-horky/helenos/usb

File:

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

uspace/lib/c/generic/str.c

@@ -540 +540 @@
 
         dstr_size = str_size(dest);
+        if (dstr_size >= size) {
+                return;
+        }
         str_cpy(dest + dstr_size, size - dstr_size, src);
 }