emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix strcpy of potentially overlapping strings

Browse Source
This commit is contained in:
Denis Vlasenko 2009-03-21 21:51:11 +00:00
parent ccff0b962c
commit 786ce17d6d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/hush.c
View File

@ -2801,7 +2801,7 @@ static char *expand_string_to_string(const char *str)
if (!list[0] || list[1]) if (!list[0] || list[1])
bb_error_msg_and_die("BUG in varexp2"); bb_error_msg_and_die("BUG in varexp2");
/* actually, just move string 2*sizeof(char*) bytes back */ /* actually, just move string 2*sizeof(char*) bytes back */
strcpy((char*)list, list[0]); overlapping_strcpy((char*)list, list[0]);
debug_printf_expand("string_to_string='%s'\n", (char*)list); debug_printf_expand("string_to_string='%s'\n", (char*)list);
return (char*)list; return (char*)list;
} }
@ -2823,7 +2823,7 @@ static char* expand_strvec_to_string(char **argv)
n++; n++;
} }
} }
strcpy((char*)list, list[0]); overlapping_strcpy((char*)list, list[0]);
debug_printf_expand("strvec_to_string='%s'\n", (char*)list); debug_printf_expand("strvec_to_string='%s'\n", (char*)list);
return (char*)list; return (char*)list;
} }