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

sed: fix double-free in FEATURE_CLEAN_UP code

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-09-25 12:50:54 +02:00
parent 76832ff5c4
commit 706a9a03bb
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
editors/sed.c
View File

@ -180,18 +180,23 @@ static void sed_free_and_close_stuff(void)
if (sed_cmd->sw_file) if (sed_cmd->sw_file)
fclose(sed_cmd->sw_file); fclose(sed_cmd->sw_file);
if (sed_cmd->beg_match) { /* Used to free regexps, but now there is code
regfree(sed_cmd->beg_match); * in get_address() which can reuse a regexp
free(sed_cmd->beg_match); * for constructs as /regexp/cmd1;//cmd2
} * leading to double-frees here:
if (sed_cmd->end_match) { */
regfree(sed_cmd->end_match); //if (sed_cmd->beg_match) {
free(sed_cmd->end_match); // regfree(sed_cmd->beg_match);
} // free(sed_cmd->beg_match);
if (sed_cmd->sub_match) { //}
regfree(sed_cmd->sub_match); //if (sed_cmd->end_match) {
free(sed_cmd->sub_match); // regfree(sed_cmd->end_match);
} // free(sed_cmd->end_match);
//}
//if (sed_cmd->sub_match) {
// regfree(sed_cmd->sub_match);
// free(sed_cmd->sub_match);
//}
free(sed_cmd->string); free(sed_cmd->string);
free(sed_cmd); free(sed_cmd);
sed_cmd = sed_cmd_next; sed_cmd = sed_cmd_next;