diff mbox series

[18/23] grep: fix leaking grep pattern

Message ID 411df7248d2868e906d5ba882f9cd9abf82eaca8.1726484308.git.ps@pks.im (mailing list archive)
State New
Headers show
Series Memory leak fixes (pt.7) | expand

Commit Message

Patrick Steinhardt Sept. 16, 2024, 11:46 a.m. UTC 
When creating a pattern via `create_grep_pat()` we allocate the pattern
member of the structure regardless of the token type. But later, when we
try to free the structure, we free the pattern member conditionally on
the token type and thus leak memory.

Plug this leak. The leak is exposed by t7814, but plugging it alone does
not make the whole test suite pass.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 grep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/grep.c b/grep.c
index e5761426e4f..701e58de04e 100644
--- a/grep.c
+++ b/grep.c
@@ -843,11 +843,11 @@  static void free_grep_pat(struct grep_pat *pattern)
 				free_pcre2_pattern(p);
 			else
 				regfree(&p->regexp);
-			free(p->pattern);
 			break;
 		default:
 			break;
 		}
+		free(p->pattern);
 		free(p);
 	}
 }