libudev: path_encode - always return 0 if encoded string does not fit into size

diff --git a/configure.ac b/configure.ac
index 3aa6e7c7afc41db7be858bb4dfa2e33adac84d17..cbe2833f22233233491f9264a259e5bdff76c010 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix=
 
 dnl /* libudev version */
 LIBUDEV_LT_CURRENT=2
 
 dnl /* libudev version */
 LIBUDEV_LT_CURRENT=2

-LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_REVISION=1

 LIBUDEV_LT_AGE=2
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)
 LIBUDEV_LT_AGE=2
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)

diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c
index a40be067578e164346002410a27c634d61e95d33..243a99dce951c6dcd1cff5bbd77d86c0fb1a101f 100644 (file)
--- a/udev/lib/libudev-util.c
+++ b/udev/lib/libudev-util.c
@@ -101,12 +101,12 @@ int util_log_priority(const char *priority)
        return 0;
 }
 
        return 0;
 }
 

-size_t util_path_encode(char *s, size_t len)
+size_t util_path_encode(char *s, size_t size)

 {
 {

-       char t[(len * 4)+1];
+       char t[(size * 4)+1];

        size_t i, j;
 
        size_t i, j;
 

-       for (i = 0, j = 0; s[i] != '\0'; i++) {
+       for (i = 0, j = 0; s[i] != '\0' && i < size; i++) {

                if (s[i] == '/') {
                        memcpy(&t[j], "\\x2f", 4);
                        j += 4;
                if (s[i] == '/') {
                        memcpy(&t[j], "\\x2f", 4);
                        j += 4;


@@ -118,11 +118,12 @@ size_t util_path_encode(char *s, size_t len)
                        j++;
                }
        }
                        j++;
                }
        }

-       if (len == 0)
-               return j;
-       i = (j < len - 1) ? j : len - 1;
-       memcpy(s, t, i);
-       s[i] = '\0';
+       if (i >= size)
+               return 0;
+       if (j >= size)
+               return 0;
+       memcpy(s, t, j);
+       s[j] = '\0';

        return j;
 }
 
        return j;
 }
 


@@ -134,7 +135,7 @@ size_t util_path_decode(char *s)
                if (memcmp(&s[i], "\\x2f", 4) == 0) {
                        s[j] = '/';
                        i += 4;
                if (memcmp(&s[i], "\\x2f", 4) == 0) {
                        s[j] = '/';
                        i += 4;

-               }else if (memcmp(&s[i], "\\x5c", 4) == 0) {
+               } else if (memcmp(&s[i], "\\x5c", 4) == 0) {

                        s[j] = '\\';
                        i += 4;
                } else {
                        s[j] = '\\';
                        i += 4;
                } else {