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

ash: add INT_OFF/ON around allocations

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-02-03 13:00:06 +01:00
parent b6871c1965
commit 5f7c82b32f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@ -12686,7 +12686,7 @@ dotcmd(int argc_ UNUSED_PARAM, char **argv_ UNUSED_PARAM)
fullname = find_dot_file(argv[0]); fullname = find_dot_file(argv[0]);
argv++; argv++;
args_need_save = argv[0]; args_need_save = argv[0];
if (args_need_save) { /* . FILE ARGS, ARGS exist */ if (args_need_save) { /* ". FILE ARGS", and ARGS are not empty */
int argc; int argc;
saveparam = shellparam; saveparam = shellparam;
shellparam.malloced = 0; shellparam.malloced = 0;
@ -13480,7 +13480,7 @@ procargs(char **argv)
#if DEBUG == 2 #if DEBUG == 2
debug = 1; debug = 1;
#endif #endif
/* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */ /* POSIX 1003.2: first arg after "-c CMD" is $0, remainder $1... */
if (xminusc) { if (xminusc) {
minusc = *xargv++; minusc = *xargv++;
if (*xargv) if (*xargv)
@ -13661,9 +13661,11 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
if (!hp) { if (!hp) {
hp = lookupvar("HOME"); hp = lookupvar("HOME");
if (hp) { if (hp) {
INT_OFF;
hp = concat_path_file(hp, ".ash_history"); hp = concat_path_file(hp, ".ash_history");
setvar0("HISTFILE", hp); setvar0("HISTFILE", hp);
free((char*)hp); free((char*)hp);
INT_ON;
hp = lookupvar("HISTFILE"); hp = lookupvar("HISTFILE");
} }
} }