unit-name: Fix unescaping

Invalid characters in unit names are escaped as \xFF. However, when
unescaping we were looking for \FF.

diff --git a/src/unit-name.c b/src/unit-name.c
index d0cfca62549cb9af5329d7a84e491de355679903..debf2b265333c0bbcb66f2a014275e09afcdf2ec 100644 (file)
--- a/src/unit-name.c
+++ b/src/unit-name.c
@@ -272,13 +272,13 @@ char *unit_name_unescape(const char *f) {
                 else if (*f == '\\') {
                         int a, b;
 
                 else if (*f == '\\') {
                         int a, b;
 

-                        if ((a = unhexchar(f[1])) < 0 ||
-                            (b = unhexchar(f[2])) < 0) {
-                                /* Invalid escape code, let's take it literal then */
+                        if (f[1] != 'x' || (a = unhexchar(f[2])) < 0 ||
+                                       (b = unhexchar(f[3])) < 0) {
+                               /* Invalid escape code, let's take it literal then */

                                 *(t++) = '\\';
                         } else {
                                 *(t++) = (char) ((a << 4) | b);
                                 *(t++) = '\\';
                         } else {
                                 *(t++) = (char) ((a << 4) | b);

-                                f += 2;
+                                f += 3;

                         }
                 } else
                         *(t++) = *f;
                         }
                 } else
                         *(t++) = *f;