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

ash: revert wrong "fix" for an apparent memory leak. Closes 5822

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-01-17 13:02:27 +01:00
parent 5d78355d5a
commit 7c4b13e019
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/ash.c
View File

@ -8677,8 +8677,17 @@ expredir(union node *n)
#if ENABLE_ASH_BASH_COMPAT #if ENABLE_ASH_BASH_COMPAT
store_expfname: store_expfname:
#endif #endif
#if 0
// By the design of stack allocator, the loop of this kind:
// while true; do while true; do break; done </dev/null; done
// will look like a memory leak: ash plans to free expfname's
// of "/dev/null" as soon as it finishes running the loop
// (in this case, never).
// This "fix" is wrong:
if (redir->nfile.expfname) if (redir->nfile.expfname)
stunalloc(redir->nfile.expfname); stunalloc(redir->nfile.expfname);
// It results in corrupted state of stacked allocations.
#endif
redir->nfile.expfname = fn.list->text; redir->nfile.expfname = fn.list->text;
break; break;
case NFROMFD: case NFROMFD: