From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC4EF78C75 for ; Wed, 4 Dec 2024 08:46:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733301987; cv=none; b=HyEFvcF5xH7CthIRFcvYdDL9nrX8wkeqmdeD8oKEOhvsBi6OqsD2yUl12aXtSYL+EuzMNm2pyrGKRmRUH9Ogq6OOai6NNeug0qd9MDTsIm3cGsuGwKsYIXsGK3ohO6CvKVhWlmeMWt0pZL1r1UfgPPO1UM6jQx8I6VOfoYLW7/w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733301987; c=relaxed/simple; bh=ltogKO0aJFAc5Z7MIyKZXVUyzMctEy5Qd3+1HqL0WL4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=BUIEIrNo7uWYvB2VWlzufKOzS7/AOd1/ivU7hrHv7K+jZwKa0YHmb3uX/co+BwYZZXBe9sobglnrUcHtsY1GYQheInNNiepAQfmgInW9YR6AIFkVj5/p8xYSFzYUh0x8XCkDfjgGWP0AeO/v8ZHO0Q1gBPX2KwvKHoLzSyvVEM8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IAg4+Vf/; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IAg4+Vf/" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-432d86a3085so55002815e9.2 for ; Wed, 04 Dec 2024 00:46:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733301984; x=1733906784; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ibOF3OLC7HXjCD90s0W+UWlQjYAfQ7uKXBwIw+ZoFd0=; b=IAg4+Vf/YW9RzhHHEPX8lbrmLo5vhO/oxnFMEsg6L1a8HkUFvZV9msuTxDcCIyFTyM CMw2f8gTQWBNWuC9GJI4PSgFKRIB9Zr850cZqAWvRB/mE/4evR6XasdZDznZ7s1yR5bL MMkNcx+eyELxUEsmrfAA+3VcJeb5EcGo7LG41ueM4BXAehRSvjIxr0lAkIQp8BUHGgWK ORbpah/Lyg/d+HnIFLjqhTeMbH27uIORAKUaXHiSyT+bZHsjp5PG+vsyGUQoEwHoV4xV edAkDM9Dp/oV9i0qXQcVqcwKfKsgzWcaFKjAV2EOHQYTVsUi3aGrPN0YECzdgdlCrOy5 qnuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733301984; x=1733906784; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ibOF3OLC7HXjCD90s0W+UWlQjYAfQ7uKXBwIw+ZoFd0=; b=DQtxAHeNZPP/uCdjm4afEHKGNi96cHffyGCTVQVyXFKr2f0fNweRhUZw+wrVNNhEyq KQTmrBAMW9kpPFmxpQlcRljJiyjX/Qrca9g6L9hPq5T65xvBI11MNc5J1635wX4QRuhX XaAB6DdBQHUXj9TTFUON+0QcL+BeLhbm0yrYnN03ybE4mvAIX4P0MC1Ntgnz2pDXQE3c w1jKl2fUabIPYtJs+YRzM2FmLKI2OmkaQQf69Z9oBI6AbisdXlIrOUC5sOPMiI5tK/8B x6FYMEU28XfaNgGAoqcc7G0MZDgv7Mf2zmxDP6tFCvQCEd/pS/C2eYFM96gCB0j7Ba6L gyag== X-Gm-Message-State: AOJu0YzjtDn70cvUybX4WwSO02xO+XrOzyc7H858cdHFEoigb/VaFZ+S 81Qdt+Y6Wck61JnGa6Rt1njuTK5+pMQK7qN6mV0nVkK7QMS3bNwB9HRkJw== X-Gm-Gg: ASbGncvjNdbSg6MIpI9NeObyovLsJR4ieIOk0X9O5Hl2dRtzNPnenz8VyvzupHE2x5R PZKh17AbBq1iz6mokg5Y5JRRhm+ToPGMYVrt8fuIGtMGNDXM+xfdJJBwPSg7HbgOfdxuz44NdjK XW3fRhHAwYP3eZGQ+UKfuJu7Rb5Z7YLXUiFPAM4/vRYvqZ4tYK+/5ZR5i09B5CRZxH86TK6yvrk YgnsQzvCMZHPbu+YMdimPR/i1igdUV/qrBwAyoUOLQTjiC12M9xNGlVODw2l8mVf4MmPoHOjaaG ci1qHOm1 X-Google-Smtp-Source: AGHT+IHaYA9k9jwT/6WqubM0Jttqg4ugjQJ5G/WCPL65YPv4cQ3pdqrXjmYqPbZj12YKwjoM++47CA== X-Received: by 2002:a05:600c:3b83:b0:434:a902:97cf with SMTP id 5b1f17b1804b1-434d09bf0edmr47717155e9.14.1733301983884; Wed, 04 Dec 2024 00:46:23 -0800 (PST) Received: from gmail.com (231.red-88-14-48.dynamicip.rima-tde.net. [88.14.48.231]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434d52723fasm16518105e9.10.2024.12.04.00.46.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Dec 2024 00:46:23 -0800 (PST) Message-ID: Date: Wed, 4 Dec 2024 09:46:22 +0100 Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] strvec: `strvec_splice()` to a statically initialized vector To: Junio C Hamano Cc: Git List , Patrick Steinhardt References: <37d0abbf-c703-481d-9f26-b237aac54c05@gmail.com> <5bea9f20-eb0d-409d-8f37-f20697d6ce14@gmail.com> From: =?UTF-8?Q?Rub=C3=A9n_Justo?= Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On Wed, Dec 04, 2024 at 04:41:36PM +0900, Junio C Hamano wrote: > This is queued as rj/strvec-splice-fix, and t/unit-tests/bin/unit-tests > dies of leaks under leak-check. Right! We need this: diff --git a/strvec.c b/strvec.c index 087c020f5b..b1e6c5d8cd 100644 --- a/strvec.c +++ b/strvec.c @@ -66,6 +66,7 @@ void strvec_splice(struct strvec *array, size_t idx, size_t len, array->v = NULL; ALLOC_GROW(array->v, array->nr + (replacement_len - len) + 1, array->alloc); + array->v[array->nr + 1] = NULL; } for (size_t i = 0; i < len; i++) free((char *)array->v[idx + i]); Sorry. I'll re-roll later today. > > > > $ t/unit-tests/bin/unit-tests > TAP version 13 > # start of suite 1: ctype > ok 1 - ctype::isspace > ok 2 - ctype::isdigit > ok 3 - ctype::isalpha > ok 4 - ctype::isalnum > ok 5 - ctype::is_glob_special > ok 6 - ctype::is_regex_special > ok 7 - ctype::is_pathspec_magic > ok 8 - ctype::isascii > ok 9 - ctype::islower > ok 10 - ctype::isupper > ok 11 - ctype::iscntrl > ok 12 - ctype::ispunct > ok 13 - ctype::isxdigit > ok 14 - ctype::isprint > # start of suite 2: strvec > ok 15 - strvec::init > ok 16 - strvec::dynamic_init > ok 17 - strvec::clear > ok 18 - strvec::push > ok 19 - strvec::pushf > ok 20 - strvec::pushl > ok 21 - strvec::pushv > not ok 22 - strvec::splice_just_initialized_strvec > --- > reason: | > String mismatch: (&vec)->v[i] != expect[i] > 'bar' != '(null)' > at: > file: 't/unit-tests/strvec.c' > line: 97 > function: 'test_strvec__splice_just_initialized_strvec' > --- > ok 23 - strvec::splice_with_same_size_replacement > ok 24 - strvec::splice_with_smaller_replacement > ok 25 - strvec::splice_with_bigger_replacement > ok 26 - strvec::splice_with_empty_replacement > ok 27 - strvec::splice_with_empty_original > ok 28 - strvec::splice_at_tail > ok 29 - strvec::replace_at_head > ok 30 - strvec::replace_at_tail > ok 31 - strvec::replace_in_between > ok 32 - strvec::replace_with_substring > ok 33 - strvec::remove_at_head > ok 34 - strvec::remove_at_tail > ok 35 - strvec::remove_in_between > ok 36 - strvec::pop_empty_array > ok 37 - strvec::pop_non_empty_array > ok 38 - strvec::split_empty_string > ok 39 - strvec::split_single_item > ok 40 - strvec::split_multiple_items > ok 41 - strvec::split_whitespace_only > ok 42 - strvec::split_multiple_consecutive_whitespaces > ok 43 - strvec::detach > > ================================================================= > ==5178==ERROR: LeakSanitizer: detected memory leaks > > Direct leak of 192 byte(s) in 1 object(s) allocated from: > #0 0x5600496ec825 in __interceptor_realloc (/usr/local/google/home/jch/w/git.git/t/unit-tests/bin/unit-tests+0x67825) (BuildId: 6efbef9c6f87bfa879e770b463031b396d4d5efe) > #1 0x56004973b4cd in xrealloc /usr/local/google/home/jch/w/git.git/wrapper.c:140:8 > #2 0x560049714c6f in strvec_splice /usr/local/google/home/jch/w/git.git/strvec.c:67:3 > #3 0x5600496f0c1d in test_strvec__splice_just_initialized_strvec /usr/local/google/home/jch/w/git.git/t/unit-tests/strvec.c:96:2 > #4 0x5600496f627b in clar_run_test /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:315:3 > #5 0x5600496f46fa in clar_run_suite /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:412:3 > #6 0x5600496f43e1 in clar_test_run /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:608:4 > #7 0x5600496f4bdf in clar_test /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:651:11 > #8 0x5600496f787c in cmd_main /usr/local/google/home/jch/w/git.git/t/unit-tests/unit-test.c:42:8 > #9 0x5600496f793a in main /usr/local/google/home/jch/w/git.git/common-main.c:9:11 > #10 0x7f59ea91dc89 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 > > Direct leak of 48 byte(s) in 1 object(s) allocated from: > #0 0x5600496ec640 in __interceptor_calloc (/usr/local/google/home/jch/w/git.git/t/unit-tests/bin/unit-tests+0x67640) (BuildId: 6efbef9c6f87bfa879e770b463031b396d4d5efe) > #1 0x5600496f4cee in clar__fail /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:687:15 > #2 0x5600496f5f25 in clar__assert_equal /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:844:3 > #3 0x5600496f0db6 in test_strvec__splice_just_initialized_strvec /usr/local/google/home/jch/w/git.git/t/unit-tests/strvec.c:97:2 > #4 0x5600496f627b in clar_run_test /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:315:3 > #5 0x5600496f46fa in clar_run_suite /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:412:3 > #6 0x5600496f43e1 in clar_test_run /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:608:4 > #7 0x5600496f4bdf in clar_test /usr/local/google/home/jch/w/git.git/t/unit-tests/clar/clar.c:651:11 > #8 0x5600496f787c in cmd_main /usr/local/google/home/jch/w/git.git/t/unit-tests/unit-test.c:42:8 > #9 0x5600496f793a in main /usr/local/google/home/jch/w/git.git/common-main.c:9:11 > #10 0x7f59ea91dc89 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 > > Indirect leak of 18 byte(s) in 1 object(s) allocated from: > #0 0x5600496ec3c6 in __interceptor_malloc (/usr/local/google/home/jch/w/git.git/t/unit-tests/bin/unit-tests+0x673c6) (BuildId: 6efbef9c6f87bfa879e770b463031b396d4d5efe) > #1 0x7f59ea9964f9 in strdup string/strdup.c:42:15 > #2 0x296c6c756e28271f () > > Indirect leak of 4 byte(s) in 1 object(s) allocated from: > #0 0x5600496ec3c6 in __interceptor_malloc (/usr/local/google/home/jch/w/git.git/t/unit-tests/bin/unit-tests+0x673c6) (BuildId: 6efbef9c6f87bfa879e770b463031b396d4d5efe) > #1 0x7f59ea9964f9 in strdup string/strdup.c:42:15 > > SUMMARY: LeakSanitizer: 262 byte(s) leaked in 4 allocation(s).