From: Tom Gundersen <teg@jklm.no>
Date: Sat, 16 Oct 2010 22:11:23 +0000 (+0200)
Subject: unit-name: Fix unescaping
X-Git-Tag: v12~181
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=95e501f8ab28e1645453219523c0263754db3f68;hp=abe35cc2b7921891cc56cd8d402e8f7d1ef48d39

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 d0cfca625..debf2b265 100644
--- 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;
 
-                        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);
-                                f += 2;
+                                f += 3;
                         }
                 } else
                         *(t++) = *f;