0f293b96d
Denis Vlasenko
2008-07-22
Subject
fix all cases of strcpy on overlapping strings.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/printf.c +1 -1editors/sed.c +1 -1include/libbb.h +1 -0libbb/lineedit.c +1 -1libbb/parse_config.c +1 -1libbb/safe_strncpy.c +9 -0procps/nmeter.c +1 -1
coreutils/printf.c+1 -1
| @@ -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! | |
editors/sed.c+1 -1
| @@ -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; | |
| } | |
include/libbb.h+1 -0
| @@ -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 */ | |
libbb/lineedit.c+1 -1
| @@ -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); | |
| } | |
libbb/parse_config.c+1 -1
| @@ -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) { | |
libbb/safe_strncpy.c+9 -0
| @@ -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++; |
| + | } |
| + | } |
procps/nmeter.c+1 -1
| @@ -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; | |
| } | |