mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
grep: stop leaking line strings with -f
When reading patterns from a file, we pass the lines as allocated string buffers to append_grep_pat() and never free them. That's not a problem because they are needed until the program ends anyway. However, now that the function duplicates the pattern string, we can reuse the strbuf after calling that function. This simplifies the code a bit and plugs a minor memory leak. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
526a858a99
commit
ec83061156
|
@ -681,15 +681,12 @@ static int file_callback(const struct option *opt, const char *arg, int unset)
|
|||
if (!patterns)
|
||||
die_errno(_("cannot open '%s'"), arg);
|
||||
while (strbuf_getline(&sb, patterns, '\n') == 0) {
|
||||
char *s;
|
||||
size_t len;
|
||||
|
||||
/* ignore empty line like grep does */
|
||||
if (sb.len == 0)
|
||||
continue;
|
||||
|
||||
s = strbuf_detach(&sb, &len);
|
||||
append_grep_pat(grep_opt, s, len, arg, ++lno, GREP_PATTERN);
|
||||
append_grep_pat(grep_opt, sb.buf, sb.len, arg, ++lno,
|
||||
GREP_PATTERN);
|
||||
}
|
||||
if (!from_stdin)
|
||||
fclose(patterns);
|
||||
|
|
Loading…
Reference in a new issue