From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Fri, 8 Sep 2017 14:36:26 +0000 (+0200)
Subject: lib/mbsalign: encode backslash to prevent ambiguity
X-Git-Tag: v2.32-rc1~117^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ded09e8ed60d031ad3963dccc1c71800f1d539e1;p=thirdparty%2Futil-linux.git

lib/mbsalign: encode backslash to prevent ambiguity

Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
---

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index 78ab12a0da..dce1a13214 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -54,7 +54,7 @@ size_t mbs_safe_nwidth(const char *buf, size_t bufsz, size_t *sz)
 		last = p + (bufsz - 1);
 
 	while (p && *p && p <= last) {
-		if (iscntrl((unsigned char) *p)) {
+		if (*p == '\\' || iscntrl((unsigned char) *p)) {
 			width += 4, bytes += 4;		/* *p encoded to \x?? */
 			p++;
 		}
@@ -135,7 +135,7 @@ char *mbs_safe_encode_to_buffer(const char *s, size_t *width, char *buf, const c
 			continue;
 		}
 
-		if (iscntrl((unsigned char) *p)) {
+		if (*p == '\\' || iscntrl((unsigned char) *p)) {
 			sprintf(r, "\\x%02x", (unsigned char) *p);
 			r += 4;
 			*width += 4;