Thread (14 messages) flat view 14 messages, 4 authors, 2016-06-15

Re: [PATCH V2 6/6] WIP/RFC/entry.c: fix a memleak

From: Eric Sunshine <hidden>
Date: 2016-06-15 23:04:18

On Fri, Mar 27, 2015 at 6:32 PM, Stefan Beller [off-list ref] wrote:
quoted hunk ↗ jump to hunk
I  observe that filter is going out of scope, but the
implementation proposed in this patch produces just a
crash instead of any helpful fix.

Signed-off-by: Stefan Beller <redacted>
---
diff --git a/entry.c b/entry.c
index 1eda8e9..5383001 100644
--- a/entry.c
+++ b/entry.c
@@ -152,8 +152,10 @@ static int write_entry(struct cache_entry *ce,
                if (filter &&
                    !streaming_write_entry(ce, path, filter,
                                           state, to_tempfile,
-                                          &fstat_done, &st))
+                                          &fstat_done, &st)) {
+                       free_stream_filter(filter);
Aside from the crash you are seeing, this is a bogus fix anyway.
You're only freeing 'filter' if it was allocated _and_ if
streaming_write_entry() returned 0. I would guess your intention was
to free 'filter' regardless of the result of streaming_write_entry().
                        goto finish;
+               }
        }

        switch (ce_mode_s_ifmt) {
--
2.3.0.81.gc37f363
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help