aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-11-29 13:15:57 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-11-29 13:16:15 +0100
commit9a2b6dcc2d3298499b88aea3b04c967f2f9ae965 (patch)
tree5b29b816b942db32d516a6afba8d70899eb51414
parent480c7e5dfbddafa763f241aecfe3831d2b3dfca5 (diff)
downloadbusybox-9a2b6dcc2d3298499b88aea3b04c967f2f9ae965.tar.gz
busybox-9a2b6dcc2d3298499b88aea3b04c967f2f9ae965.tar.bz2
libbb: do not misinterpret 0x10-0x19 chars in "\xNNN" too
function old new delta bb_process_escape_sequence 141 151 +10 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/process_escape_sequence.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 11adbfcea..13022b83e 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -37,17 +37,15 @@ char FAST_FUNC bb_process_escape_sequence(const char **ptr)
* We treat \2 as a valid octal escape sequence. */
do {
unsigned r;
-#if !WANT_HEX_ESCAPES
unsigned d = (unsigned char)(*q) - '0';
-#else
- unsigned d = (unsigned char)_tolower(*q) - '0';
+#if WANT_HEX_ESCAPES
if (d >= 10) {
- //d += ('0' - 'a' + 10);
- /* The above would maps 'A'-'F' and 'a'-'f' to 10-15,
+ d = (unsigned char)_tolower(*q) - 'a';
+ //d += 10;
+ /* The above would map 'A'-'F' and 'a'-'f' to 10-15,
* however, some chars like '@' would map to 9 < base.
* Do not allow that, map invalid chars to N > base:
*/
- d += ('0' - 'a');
if ((int)d >= 0)
d += 10;
}