fix all cases of strcpy on overlapping strings.

diff --git a/coreutils/printf.c b/coreutils/printf.c
index 7f6235a874b944144a113a51385fa8a59ef42ce7..72acbc7510d4f73dd956e03575e293e0f1b87930 100644 (file)
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -289,7 +289,7 @@ static char **print_formatted(char *f, char **argv)
                        /* Remove size modifiers - "%Ld" would try to printf
                         * long long, we pass long, and it spews garbage */
                        if ((*f | 0x20) == 'l' || *f == 'h' || *f == 'z') {
-                               strcpy(f, f + 1);
+                               overlapping_strcpy(f, f + 1);
                        }
 //FIXME: actually, the same happens with bare "%d":
 //it printfs an int, but we pass long!

diff --git a/editors/sed.c b/editors/sed.c
index 496d3d22ea5b8b38d1e7f6a1052cc18f10468edd..eb31f7d2e19630b1e105001b8eb80c673182c1ac 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1219,7 +1219,7 @@ static void add_cmd_block(char *cmdstr)
                                slashes++;
                        /* Odd number of preceding slashes - newline is escaped */
                        if (slashes & 1) {
-                               strcpy(eol-1, eol);
+                               overlapping_strcpy(eol - 1, eol);
                                eol = strchr(eol, '\n');
                                goto next;
                        }

diff --git a/include/libbb.h b/include/libbb.h
index 684e130c92281ea99f2c97845b378302096a32ee..c0b731b36e708b541765ecb61e6ac6036f84dab5 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -540,6 +540,7 @@ ssize_t recv_from_to(int fd, void *buf, size_t len, int flags,
 
 char *xstrdup(const char *s) FAST_FUNC;
 char *xstrndup(const char *s, int n) FAST_FUNC;
+void overlapping_strcpy(char *dst, const char *src) FAST_FUNC;
 char *safe_strncpy(char *dst, const char *src, size_t size) FAST_FUNC;
 /* Guaranteed to NOT be a macro (smallest code). Saves nearly 2k on uclibc.
  * But potentially slow, don't use in one-billion-times loops */

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 2e16e6a0ac9d9860d81958a0ddab7dc2fef7a966..032da24e7ac36f8aa6451e0a0d446f735a0f98ee 100644 (file)
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1552,7 +1552,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                vi_case(CTRL('U')|vbit:)
                        /* Control-U -- Clear line before cursor */
                        if (cursor) {
-                               strcpy(command, command + cursor);
+                               overlapping_strcpy(command, command + cursor);
                                command_len -= cursor;
                                redraw(cmdedit_y, command_len);
                        }

diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 5109066d8f7d8e551059de12f69ab26d25458f43..d1b29218bb4ff1b70e8ea0796fdf287ca71fffa6 100644 (file)
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -161,7 +161,7 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
                        int n = strspn(line, delims);
                        if (n) {
                                ii -= n;
-                               strcpy(line, line + n);
+                               overlapping_strcpy(line, line + n);
                        }
                        // cut trailing
                        if (ii) {

diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
index 649fa10cf78052c60271cba48d6a5f83dcca0001..4acd9766ba7c896076826e0f538d7fddc55af8f2 100644 (file)
--- a/libbb/safe_strncpy.c
+++ b/libbb/safe_strncpy.c
@@ -16,3 +16,12 @@ char* FAST_FUNC safe_strncpy(char *dst, const char *src, size_t size)
        dst[--size] = '\0';
        return strncpy(dst, src, size);
 }
+
+/* Like strcpy but can copy overlapping strings. */
+void FAST_FUNC overlapping_strcpy(char *dst, const char *src)
+{
+       while ((*dst = *src) != '\0') {
+               dst++;
+               src++;
+       }
+}

diff --git a/procps/nmeter.c b/procps/nmeter.c
index 8cff0b918de787e987612bc68d0a124dc83dee02..be039320b5fdc3d9c4cec6b4a931f658be0b8498 100644 (file)
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -800,7 +800,7 @@ int nmeter_main(int argc, char **argv)
                if (!cur)
                        break;
                if (cur[1] == '%') {    // %%
-                       strcpy(cur, cur+1);
+                       overlapping_strcpy(cur, cur + 1);
                        cur++;
                        goto again;
                }