diff options
Diffstat (limited to 'udev/lib')
| -rw-r--r-- | udev/lib/libudev-util.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c index 0ff121d774..6586d1c825 100644 --- a/udev/lib/libudev-util.c +++ b/udev/lib/libudev-util.c @@ -114,7 +114,6 @@ size_t util_path_encode(char *s, size_t len) char t[(len * 3)+1]; size_t i, j; - t[0] = '\0'; for (i = 0, j = 0; s[i] != '\0'; i++) { if (s[i] == '/') { memcpy(&t[j], "\\x2f", 4); @@ -127,8 +126,11 @@ size_t util_path_encode(char *s, size_t len) j++; } } - t[j] = '\0'; - strncpy(s, t, len); + if (len == 0) + return j; + i = (j < len - 1) ? j : len - 1; + memcpy(s, t, i); + s[i] = '\0'; return j; } |