diff --git a/sed/compile.c b/sed/compile.c index 2637ba6..5e2032d 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -757,6 +757,8 @@ setup_replacement (struct subst *sub, const char *text, size_t length) base = MEMDUP (text, length, char); length = normalize_text (base, length, TEXT_REPLACEMENT); + IF_LINT (sub->replacement_buffer = base); + text_end = base + length; tail = &root; @@ -1330,6 +1332,8 @@ compile_program (struct vector *vector) trans_pairs[2 * i] = NULL; if (idx != dest_len) bad_prog (_(Y_CMD_LEN)); + + IF_LINT (free (src_lens)); } else { @@ -1678,7 +1682,7 @@ rewind_read_files (void) /* Release all resources which were allocated in this module. */ void -finish_program (void) +finish_program (struct vector *program) { /* close all files... */ { @@ -1708,7 +1712,29 @@ finish_program (void) file_read = file_write = NULL; } -#ifdef DEBUG_LEAKS +#ifdef lint + for (int i = 0; i < program->v_length; ++i) + { + const struct sed_cmd *sc = &program->v[i]; + + if (sc->a1 && sc->a1->addr_regex) + release_regex (sc->a1->addr_regex); + if (sc->a2 && sc->a2->addr_regex) + release_regex (sc->a2->addr_regex); + + switch (sc->cmd) + { + case 's': + free (sc->x.cmd_subst->replacement_buffer); + if (sc->x.cmd_subst->regx) + release_regex (sc->x.cmd_subst->regx); + break; + } + } + obstack_free (&obs, NULL); -#endif /*DEBUG_LEAKS*/ +#else + (void)program; +#endif /* lint */ + } diff --git a/sed/execute.c b/sed/execute.c index fe37ad3..58be321 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -1502,6 +1502,13 @@ execute_program (struct vector *vec, struct input *input) aq->text = text; aq->textlen = result; } + else + { + /* The external input file (for R command) reached EOF, + the 'text' buffer will not be added to the append queue + so release it */ + free (text); + } } break; @@ -1683,7 +1690,7 @@ process_files (struct vector *the_program, char **argv) } closedown (&input); -#ifdef DEBUG_LEAKS +#ifdef lint /* We're about to exit, so these free()s are redundant. But if we're running under a memory-leak detecting implementation of malloc(), we want to explicitly @@ -1694,7 +1701,7 @@ process_files (struct vector *the_program, char **argv) free (hold.text); free (line.text); free (s_accum.text); -#endif /*DEBUG_LEAKS*/ +#endif /* lint */ if (input.bad_count) status = EXIT_BAD_INPUT; diff --git a/sed/regexp.c b/sed/regexp.c index 8eba866..2801d6f 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -425,11 +425,17 @@ match_regex (struct regex *regex, char *buf, size_t buflen, } -#ifdef DEBUG_LEAKS +#ifdef lint void release_regex (struct regex *regex) { + if (regex->dfa) + { + dfafree (regex->dfa); + free (regex->dfa); + regex->dfa = NULL; + } regfree (®ex->pattern); free (regex); } -#endif /*DEBUG_LEAKS*/ +#endif /* lint */ diff --git a/sed/sed.c b/sed/sed.c index be1aaad..aa746aa 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -375,7 +375,7 @@ main (int argc, char **argv) return_code = process_files (the_program, argv+optind); - finish_program (); + finish_program (the_program); ck_fclose (NULL); return return_code; diff --git a/sed/sed.h b/sed/sed.h index 93b2c7f..0e3c601 100644 --- a/sed/sed.h +++ b/sed/sed.h @@ -126,6 +126,9 @@ struct subst { unsigned print : 2; /* 'p' option given (before/after eval) */ unsigned eval : 1; /* 'e' option given */ unsigned max_id : 4; /* maximum backreference on the RHS */ +#ifdef lint + char* replacement_buffer; +#endif }; #ifdef REG_PERL @@ -190,13 +193,13 @@ struct vector *compile_string (struct vector *, char *str, size_t len); struct vector *compile_file (struct vector *, const char *cmdfile); void check_final_program (struct vector *); void rewind_read_files (void); -void finish_program (void); +void finish_program (struct vector *); struct regex *compile_regex (struct buffer *b, int flags, int needed_sub); int match_regex (struct regex *regex, char *buf, size_t buflen, size_t buf_start_offset, struct re_registers *regarray, int regsize); -#ifdef DEBUG_LEAKS +#ifdef lint void release_regex (struct regex *); #endif diff --git a/sed/utils.c b/sed/utils.c index 329dec0..7b0c3c8 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -74,7 +74,14 @@ panic (const char *str, ...) strerror (errno)); } +#ifdef lint + struct open_file *next = open_files->link; + free (open_files->name); + free (open_files); + open_files = next; +#else open_files = open_files->link; +#endif } exit (EXIT_PANIC);