Merge branch 'busybox' into merge

2 files changed, 19 insertions, 7 deletions

diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
index 9a8a51440..d6459d7c3 100644
--- a/libbb/print_numbered_lines.c
+++ b/libbb/print_numbered_lines.c
@@ -8,12 +8,16 @@
 
 #include "libbb.h"
 
-void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
+int FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
 {
         FILE *fp = fopen_or_warn_stdin(filename);
-        unsigned N = ns->start;
+        unsigned N;
         char *line;
 
+        if (!fp)
+                return EXIT_FAILURE;
+
+        N = ns->start;
         while ((line = xmalloc_fgetline(fp)) != NULL) {
                 if (ns->all
                  || (ns->nonempty && line[0])
@@ -27,4 +31,6 @@ void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filenam
         ns->start = N;
 
         fclose(fp);
+
+        return EXIT_SUCCESS;
 }
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 59d0d3ea8..13022b83e 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -37,12 +37,18 @@ 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 (d >= 10)
-                        d += ('0' - 'a' + 10);
+#if WANT_HEX_ESCAPES
+                if (d >= 10) {
+                        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:
+                         */
+                        if ((int)d >= 0)
+                                d += 10;
+                }
 #endif
                 if (d >= base) {
                         if (WANT_HEX_ESCAPES && base == 16) {