]> git.ipfire.org Git - thirdparty/git.git/commitdiff
preload-index: fix memleak
authorAnthony Delannoy <anthony.2lannoy@gmail.com>
Mon, 22 Aug 2022 21:15:07 +0000 (23:15 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Aug 2022 22:08:30 +0000 (15:08 -0700)
Fix a memory leak occuring in case of pathspec copy in preload_index.

Direct leak of 8 byte(s) in 8 object(s) allocated from:
    #0 0x7f0a353ead47 in __interceptor_malloc (/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/libasan.so.6+0xb5d47)
    #1 0x55750995e840 in do_xmalloc /home/anthony/src/c/git/wrapper.c:51
    #2 0x55750995e840 in xmalloc /home/anthony/src/c/git/wrapper.c:72
    #3 0x55750970f824 in copy_pathspec /home/anthony/src/c/git/pathspec.c:684
    #4 0x557509717278 in preload_index /home/anthony/src/c/git/preload-index.c:135
    #5 0x55750975f21e in refresh_index /home/anthony/src/c/git/read-cache.c:1633
    #6 0x55750915b926 in cmd_status builtin/commit.c:1547
    #7 0x5575090e1680 in run_builtin /home/anthony/src/c/git/git.c:466
    #8 0x5575090e1680 in handle_builtin /home/anthony/src/c/git/git.c:720
    #9 0x5575090e284a in run_argv /home/anthony/src/c/git/git.c:787
    #10 0x5575090e284a in cmd_main /home/anthony/src/c/git/git.c:920
    #11 0x5575090dbf82 in main /home/anthony/src/c/git/common-main.c:56
    #12 0x7f0a348230ab  (/lib64/libc.so.6+0x290ab)

Signed-off-by: Anthony Delannoy <anthony.2lannoy@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
preload-index.c

index e5529a586366d4031a5300d7ab0dfa6ec97489b8..100f7a374dca1b8ffaae1ae9a2c00011d05a208a 100644 (file)
@@ -151,6 +151,12 @@ void preload_index(struct index_state *index,
        }
        stop_progress(&pd.progress);
 
+       if (pathspec) {
+               /* earlier we made deep copies for each thread to work with */
+               for (i = 0; i < threads; i++)
+                       clear_pathspec(&data[i].pathspec);
+       }
+
        trace_performance_leave("preload index");
 
        trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);