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

sed: fix double-free in FEATURE_CLEAN_UP=y configs

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2023-01-02 17:05:55 +01:00
parent cadf57b3af
commit 9b2d766e0e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editors/sed.c
View File

@ -99,7 +99,7 @@ enum {
struct sed_FILE { struct sed_FILE {
struct sed_FILE *next; /* Next (linked list, NULL terminated) */ struct sed_FILE *next; /* Next (linked list, NULL terminated) */
const char *fname; char *fname;
FILE *fp; FILE *fp;
}; };
@ -188,9 +188,6 @@ static void sed_free_and_close_stuff(void)
while (sed_cmd) { while (sed_cmd) {
sed_cmd_t *sed_cmd_next = sed_cmd->next; sed_cmd_t *sed_cmd_next = sed_cmd->next;
if (sed_cmd->sw_file)
fclose(sed_cmd->sw_file);
/* Used to free regexps, but now there is code /* Used to free regexps, but now there is code
* in get_address() which can reuse a regexp * in get_address() which can reuse a regexp
* for constructs as /regexp/cmd1;//cmd2 * for constructs as /regexp/cmd1;//cmd2
@ -217,6 +214,18 @@ static void sed_free_and_close_stuff(void)
if (G.current_fp) if (G.current_fp)
fclose(G.current_fp); fclose(G.current_fp);
if (G.FILE_head) {
struct sed_FILE *cur = G.FILE_head;
do {
struct sed_FILE *p;
fclose(cur->fp);
free(cur->fname);
p = cur;
cur = cur->next;
free(p);
} while (cur);
}
} }
#else #else
void sed_free_and_close_stuff(void); void sed_free_and_close_stuff(void);