Merge branch 'busybox' into merge

4 files changed, 22 insertions, 3 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 6ecf01765..19b579782 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1139,7 +1139,7 @@ static void showfiles(void)
                         );
                 }
                 if (ENABLE_UNICODE_SUPPORT)
-                        puts(printable_string(NULL, matches[n]));
+                        puts(printable_string(matches[n]));
                 else
                         puts(matches[n]);
         }
diff --git a/libbb/printable_string.c b/libbb/printable_string.c
index e638a178e..2e8895a4f 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -9,7 +9,7 @@
 #include "libbb.h"
 #include "unicode.h"
 
-const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
+const char* FAST_FUNC printable_string2(uni_stat_t *stats, const char *str)
 {
         char *dst;
         const char *s;
@@ -55,3 +55,8 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
 #endif
         return auto_string(dst);
 }
+
+const char* FAST_FUNC printable_string(const char *str)
+{
+        return printable_string2(NULL, str);
+}
diff --git a/libbb/time.c b/libbb/time.c
index 82e6cb172..f9b8da0b3 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -184,6 +184,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                         ptm->tm_year -= 1900; /* Adjust years */
                         ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
                 } else {
+ err:
                         bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 }
                 ptm->tm_sec = 0; /* assume zero if [.SS] is not given */
@@ -194,6 +195,19 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                 end = '\0';
                         /* else end != NUL and we error out */
                 }
+                /* Users were confused by "date -s 20180923"
+                 * working (not in the way they were expecting).
+                 * It was interpreted as MMDDhhmm, and not bothered by
+                 * "month #20" in the least. Prevent such cases:
+                 */
+                if (ptm->tm_sec > 60 /* allow "23:60" leap second */
+                 || ptm->tm_min > 59
+                 || ptm->tm_hour > 23
+                 || ptm->tm_mday > 31
+                 || ptm->tm_mon > 11 /* month# is 0..11, not 1..12 */
+                ) {
+                        goto err;
+                }
         }
         if (end != '\0') {
                 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
diff --git a/libbb/unicode.c b/libbb/unicode.c
index d378175a4..89d42179b 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -996,7 +996,7 @@ size_t FAST_FUNC unicode_strlen(const char *string)
 size_t FAST_FUNC unicode_strwidth(const char *string)
 {
         uni_stat_t uni_stat;
-        printable_string(&uni_stat, string);
+        printable_string2(&uni_stat, string);
         return uni_stat.unicode_width;
 }