From patchwork Thu Oct 21 15:57:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12575683 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0328C433FE for ; Thu, 21 Oct 2021 15:57:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6174611CE for ; Thu, 21 Oct 2021 15:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231745AbhJUQAA (ORCPT ); Thu, 21 Oct 2021 12:00:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231207AbhJUP76 (ORCPT ); Thu, 21 Oct 2021 11:59:58 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FA12C0613B9 for ; Thu, 21 Oct 2021 08:57:42 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id u8-20020a05600c440800b0030d90076dabso7481610wmn.1 for ; Thu, 21 Oct 2021 08:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qpbXGpJIegqGLazy5lZkC3oSlZqegVglW0c+07pgA8s=; b=Dmve/UHu/0EHOO7pn6WMdnFg+STD59iyYj7DILMeDGfh59Tg/Xkv/ZL64lsX1XsfDY odyAgGrtAov8TDOg6SLHNjS8/rHzTAhN1aiOnDpX93hzrsx56A/oMKqueaxBndvFi5P6 mXpcfkkHOLfxrvHuXosCLJ+JyzdFn8u9kjrGSQQcU/nr2Psga+JqwTdkIXB21XjMgnCY Kqnx2220OQ0kH5iZnYyOqPis69urrA5QNJKFcFgWrPtE3139cHbjnEF199yHC3tBFjXw /HRUbWG6F45LcMuu9tD6je6Kx4pSg3z+w47PlXAPjeplOhL6EZ+nVMjXy6mqpbhiVIeM 4gtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qpbXGpJIegqGLazy5lZkC3oSlZqegVglW0c+07pgA8s=; b=fJL3hx/FbDWKqsfPcxN0NeL8jASfygxNO804QD+xb9vgu/G5dw0Yc2iDnpz9kWZdkg +SMkBFBXCUVmD4MiuPIZfAVg4Xp20/WQN/SFDceb7P4jA5yCw06RUPmzmczxA1vS91dY oI+ohGOvvrBFxT9dxVX7URjstYbP+68jdbsbdlBHRTj7CoMhn2SOJXAyj3rpIkU7rZau VOVfy2PuTcrCkY+oi3Y2u7eDDuJSkhJcUEVWRcZM6OUdrsUvM1vYHzHmJVhAObczn359 VzpG3Kr+MQTiSpEfLAyGAYAiC2g5Znf9XC7SUy4wsVkCa3V0VKXkDV9F6V/7Ebg20OlT xQdA== X-Gm-Message-State: AOAM531JIMK2F14L0Y7tvUoSbx0aaWSxII4hFrXCoU5N6i6/ReSLeQWp AMCt5lMUv4Zcie22mDqpI/vDgZAQ5q5VaA== X-Google-Smtp-Source: ABdhPJyC5AVY/OfjfjGAYAmJ9xaJVrzGSmg3n1QAvK9W5sHcTLGShxZOgD8v+p9SNiwzS7t6vEVjmQ== X-Received: by 2002:a7b:cb56:: with SMTP id v22mr446524wmj.77.1634831860830; Thu, 21 Oct 2021 08:57:40 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z6sm7082259wmp.1.2021.10.21.08.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 08:57:40 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Taylor Blau , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 1/6] grep: prefer "struct grep_opt" over its "void *" Date: Thu, 21 Oct 2021 17:57:32 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Stylistically fix up code added in bfac23d9534 (grep: Fix two memory leaks, 2010-01-30). We usually don't use the "arg" at all once we've unpacked it into the struct we want, let's not do that here when we're freeing it. Perhaps it was thought that a cast to "void *" would otherwise be needed? Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/grep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 8af5249a7bb..fd184c182a3 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -199,8 +199,8 @@ static void *run(void *arg) grep_source_clear_data(&w->source); work_done(w); } - free_grep_patterns(arg); - free(arg); + free_grep_patterns(opt); + free(opt); return (void*) (intptr_t) hit; } From patchwork Thu Oct 21 15:57:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12575685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9911BC433F5 for ; Thu, 21 Oct 2021 15:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 814626120C for ; Thu, 21 Oct 2021 15:57:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231701AbhJUQAB (ORCPT ); Thu, 21 Oct 2021 12:00:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231687AbhJUP77 (ORCPT ); Thu, 21 Oct 2021 11:59:59 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33F4CC061764 for ; Thu, 21 Oct 2021 08:57:43 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id r7so219575wrc.10 for ; Thu, 21 Oct 2021 08:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ytZQPlO9P1pFh9RzehhhYtcwvaGxiRmuht7ENhk+OkA=; b=WErQ8H7SkuCUeWmOFmvL7ifnlY8iJGIfLf/DU9RyxY1bbd+yM5LPBsPWcrTYWD1NM2 3cCQR1dHICc4oyvlMXprVJU6kO5sc0KftnnN7BBlPnZw9/I8JAPpjYjiEDocQw1nil8C 5yQiEOBTrLzqaeGpvExLrqiOKdNbenpx6yvJFLcwSbTlFuU2AK2+vsFEofwC69NRBRqf xVdQR2DtlNSETGS2suzjjCXtJxRamsEnYl2nRtrbyaPNUDqwlpIvGiIfCw+2D3Av3Ac4 IFVTin58XvQ52KiP85u2Ak1eIxNbKuS/Ys9/EV2cMJEKBMQZGOJC4yX1DCfJkPY6NPh0 QZTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ytZQPlO9P1pFh9RzehhhYtcwvaGxiRmuht7ENhk+OkA=; b=4TkPyOk+d1Uuun0hVrOpwmGQdNfIZcba6fs+FMG5by2mWyREhNdJwncO9mR0rY1eQD lu/ZnwBv/bXBzFvJh19dgCnwWhS+8hOkAkoy2k6Boj94BqnXvpHnkNKLWOL0rcp7TMBq 09eRqw6BrpdVw7tJ/Z72Wl28CTnRxMiSmbJLxjoK+iAPVTOA5djJF9UO6/tQ4bhILEC2 GjDN/WilX6vDB/H4fWZCw6bwgmUIyaTgtKJnoasM/FYi9GcAEE8jcx6mKkRRtNW5Rifo HlPRGXxPH4kxS1IwYnW5K8gMLffOpZr3R6XRdIUX6W1NzDuDriuNBTvHDJzpNyUjALF+ fwhA== X-Gm-Message-State: AOAM532RHswXhEyiBEh42RHvyRhTgFrYVgQweDQCYGAo9Vye76kgtuVl YRZ++EKtoEXdFITNcSNVUsMvrJivwSrjTw== X-Google-Smtp-Source: ABdhPJzgN+UtVmhgzBEtlS93Z3NsiOjPQMdWFcqK4s2sbfyIvubFiKJKiTvc11+0GU/v73KlvNKxtA== X-Received: by 2002:adf:f902:: with SMTP id b2mr8442063wrr.265.1634831861559; Thu, 21 Oct 2021 08:57:41 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z6sm7082259wmp.1.2021.10.21.08.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 08:57:41 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Taylor Blau , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 2/6] grep: use object_array_clear() in cmd_grep() Date: Thu, 21 Oct 2021 17:57:33 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Free the "struct object_array" before exiting. This makes grep tests (e.g. "t7815-grep-binary.sh") a bit happer under SANITIZE=leak. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/grep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/grep.c b/builtin/grep.c index fd184c182a3..555b2ab6008 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1196,6 +1196,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) run_pager(&opt, prefix); clear_pathspec(&pathspec); free_grep_patterns(&opt); + object_array_clear(&list); free_repos(); return !hit; } From patchwork Thu Oct 21 15:57:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12575687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 142F1C433EF for ; Thu, 21 Oct 2021 15:57:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC85A611CB for ; Thu, 21 Oct 2021 15:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231826AbhJUQAC (ORCPT ); Thu, 21 Oct 2021 12:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231743AbhJUQAA (ORCPT ); Thu, 21 Oct 2021 12:00:00 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F26BDC061764 for ; Thu, 21 Oct 2021 08:57:43 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id u8-20020a05600c440800b0030d90076dabso7481670wmn.1 for ; Thu, 21 Oct 2021 08:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mQ2t4T/52zeBY2r2c/9A/g+VIPUK1AUBzCE9i3AKqcc=; b=RxZdplMFLF3qJ1oGapAJamYJxlXraEZ9pdob5Iuo/SXGpWyNOG83flA05cAAUXtcWL znQV3wbA06kgz3ULaybtwwvCo8wJQjRVJzEbBSwX4jevP1gkqnou8e4m8UJPp5q/lXnE /Cm/YhCtuJ5jTqDgHpB7clwgyy+grjqNdQLUvoRaZI9CnUu0FUgV41dBcAJ67BnTVCLt koEc4EEoQUmgumiCydPOTTdxnPHkAWsu3PykBMFU3dJUqgoEoEP6jLXYV+kGmGTqdnqB 5OcGBf389BbZJgnZe0BRfhGOeJSzTHF6tnVjA8Kfw+iwmOe1s04cD9GAqjsmIb0z4yco eWhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mQ2t4T/52zeBY2r2c/9A/g+VIPUK1AUBzCE9i3AKqcc=; b=rLPVgFuPHqMbRoZ1F7PFxcVHnYWwz6/Wyr1XcoFGGjjUyVW01qGNBkEi6nrjtCzX1e Vf2cQkTsNFOA7CB6wIPHomEOs5i8vK/DNRb09hvjf5+9g3ddaoAmcveOxa4CvgTGPFqM bKuDEvzvI2PXFwdrHnbiQ6UedmGpP2AAKLn/ThZWbTueo236UOeOTl0QwG1N8B+n8TYb ue6L1CcTXHWqZkS9VKLlzSlEbuLnOimVnkDZ5GUSdGuex9dL+Fq0fQv8l2ftMdDmFVcQ 3UwFdu4lN0e1caCd1MDF4pwdXSquBr5HLttkcCJ8potWcQqloKZFIBpMgd3GEUmM/sQV XCpw== X-Gm-Message-State: AOAM5325JQ+flZr/u0ha1yl46yI9p3MTxAyqlDNoc5uckRZ2yzHmboXO 7wcfw7BhrjP1/8PPEB5ppkjB0/1zmVa64A== X-Google-Smtp-Source: ABdhPJzxPAhGNjddvHnrtezfGTwmIEZYEEGnJTz89VDCeVRhC7r4oArzT49M00as0ZpaBTBT+PvXJg== X-Received: by 2002:a1c:7fd0:: with SMTP id a199mr22211780wmd.96.1634831862330; Thu, 21 Oct 2021 08:57:42 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z6sm7082259wmp.1.2021.10.21.08.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 08:57:41 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Taylor Blau , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 3/6] clone: fix a memory leak of the "git_dir" variable Date: Thu, 21 Oct 2021 17:57:34 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org At this point in cmd_clone the "git_dir" is always either an xstrdup()'d string, or something we got from mkpathdup(). Let's free() it before we clobber it. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/clone.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/clone.c b/builtin/clone.c index 559acf9e036..fb377b27657 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1040,8 +1040,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix) init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL, INIT_DB_QUIET); - if (real_git_dir) + if (real_git_dir) { + free((char *)git_dir); git_dir = real_git_dir; + } /* * additional config can be injected with -c, make sure it's included From patchwork Thu Oct 21 15:57:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12575689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56672C433FE for ; Thu, 21 Oct 2021 15:57:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E6A7611CB for ; Thu, 21 Oct 2021 15:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231835AbhJUQAD (ORCPT ); Thu, 21 Oct 2021 12:00:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231773AbhJUQAA (ORCPT ); Thu, 21 Oct 2021 12:00:00 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB98CC0613B9 for ; Thu, 21 Oct 2021 08:57:44 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id v17so227850wrv.9 for ; Thu, 21 Oct 2021 08:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sFGZhDckZHi4LCQKi6L1+tYWxq8SIqnm5SIpUKcirdM=; b=b3wb3GkEPJCPvxPoDmS0kky3okjpY71wn9K+BFkQ1EIlHxhQkTjgriZpQWaT9cFqdg uw08oZxNgy+UqRdgGaxCic1eeVOZJ02bKBRvf24uWpMwh/e9swb0efqUVCkkCyKy1COI mb5sdrhIS916N1uTFT848Mb4jrU3tsg7uOOMmeGUCyHAsnUpfz+v52bhNBTHrxrSR2JP iRC4MRbonCpL7akJnxG/h+paPuZ+uI99qgHiA4oDFb2LQYGaNMprrjFPImxLqM6QiPbs 1oLFta+K+QN16hNTPSwtombftlIhJQbjlsw9NRBai/Gh+s+SjCa1gudFzrUf3UOvmttS 2Jqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sFGZhDckZHi4LCQKi6L1+tYWxq8SIqnm5SIpUKcirdM=; b=eWaFgAftyyHHkoaB2krHSzwESPaEZrglvBqUvVA9ShehHAaa23mvmtuApyJpkBZCuX WdwKLHxaYRViJnolTplENCwfP3r2vHxGTz4LP/sUBTwHwVo+cTfas3B4ydtHTefhROkr Qjf7aGUtdSfk2QVY0QeYPR/kJw18/TzVc+r/7ki8W3AUjl0plcyJis3Xz6zDwOYaXajP jnuGeA8X68s2asB6MjyNLmlLiJFia70pupw4JZsnsoRLtWhNBOMGzVpMee/vMt0Kf9mK eZ5MUNS9UsjKWgANkye+pCpwx6KrG6bihJv0Q+RvxnPmBXtgv0zdRgbRU5Gdv2It+nYe Mm2w== X-Gm-Message-State: AOAM533IwhJukC4z/sD4jwWHbgeYk5JjurqDUgwyodooTee05SR4EA6s /LFZCFq7OSHFIXfgYsAmDsT2vdzwG32+CA== X-Google-Smtp-Source: ABdhPJwqAZIgtpCPVLHeQOfVVaGuL8gs/IiFfBY31Y2IvE8pazyl9o/WeHBPlMTY0Y3jUtTyBzvFZA== X-Received: by 2002:a5d:4d06:: with SMTP id z6mr8214166wrt.149.1634831863121; Thu, 21 Oct 2021 08:57:43 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z6sm7082259wmp.1.2021.10.21.08.57.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 08:57:42 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Taylor Blau , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 4/6] submodule--helper: fix small memory leaks Date: Thu, 21 Oct 2021 17:57:35 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a missing strbuf_release() and a clear_pathspec() to the submodule--helper. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/submodule--helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 6298cbdd4e5..a157656a48a 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3220,6 +3220,7 @@ static void die_on_index_match(const char *path, int force) } free(ps_matched); } + clear_pathspec(&ps); } static void die_on_repo_without_commits(const char *path) @@ -3231,6 +3232,7 @@ static void die_on_repo_without_commits(const char *path) if (resolve_gitlink_ref(path, "HEAD", &oid) < 0) die(_("'%s' does not have a commit checked out"), path); } + strbuf_release(&sb); } static int module_add(int argc, const char **argv, const char *prefix) From patchwork Thu Oct 21 15:57:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12575691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCACDC433F5 for ; Thu, 21 Oct 2021 15:57:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4E0D611CB for ; Thu, 21 Oct 2021 15:57:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231854AbhJUQAF (ORCPT ); Thu, 21 Oct 2021 12:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231790AbhJUQAB (ORCPT ); Thu, 21 Oct 2021 12:00:01 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B1DFC061764 for ; Thu, 21 Oct 2021 08:57:45 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id v17so227898wrv.9 for ; Thu, 21 Oct 2021 08:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/opoB5BVXgEvuPJdb6xV7Te3QJvo22WiNDNaNJ9eRFo=; b=gbmWwSIIAfuOuPvkjmkRLAgHAIEUeyCVEmz/6effVb6mkAIZt4GxwAdP0DoIBOAW3f 6Z1we5C3DrV+lXYvMTKCopZidiE307OjraFGVzKBn4R6MKVTysQ1NFx55Tsri72xZSZE PL89GTP7US7gGzTxOr2gQIpSZEep7yjKKD5n048gAP/+x8k9GCSi/bStqMOnlZKzJbz5 VWcIBttoqpt/uVaqKSloT7zCmqMi5eReZTywKq49rqnIlku6KycML1ti5cjq7035O8QJ LDpIwZp+a+w+YYtIWyFCAqEpDuueHSBYje+mLbAKJBJr+00xn3iNCWsmqfTRYLR+aaKw f4XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/opoB5BVXgEvuPJdb6xV7Te3QJvo22WiNDNaNJ9eRFo=; b=sQF5AiFy9IcFu18NPOChH2rKE7sEqLjH234CSrge5dWPo94/iHtX9IIQQbyB2K0szV CT5QmhvUvPqOP1n0bXuNUNBxUKSAyl8IgQhwTYE4RF4e4RS5ru+wZKPrjUlvrlHOg1ok Er9M8BmamXE4ybc9CTKpfjY/j+cps3Zx5roA9r2ezFyt7Lc5Dd+k5qSYb9s4pKzVFJxf eUyXT9UegTCATihAPI0vMI2so1dfvjCgYrTe/sxA6W8lwON6popB5e8nTu0/uE8JVZSK pz80jTdwMc+aicUmVkimdfLky/JkCxz8d+CXvOfEmqk1S8164WByHoOAEHi+ysGx0EZ6 pwwA== X-Gm-Message-State: AOAM5331sU4Gt5/qiDGzVLFrvHnFeA7zbHFqDt30nPu0TFv4dX1S/htQ anJeCUqfYM3rNF8fqT0MgIbOG4gn+DHT6Q== X-Google-Smtp-Source: ABdhPJwCeEym8twCSVIPCWye53BgVsLTdnFU5CuzvrJcMRy5+4BhI4cSAwT5VVwE6HsXHcl9NTQatg== X-Received: by 2002:adf:f386:: with SMTP id m6mr8426621wro.389.1634831863895; Thu, 21 Oct 2021 08:57:43 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z6sm7082259wmp.1.2021.10.21.08.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 08:57:43 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Taylor Blau , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 5/6] reflog: free() ref given to us by dwim_log() Date: Thu, 21 Oct 2021 17:57:36 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When dwim_log() returns the "ref" is always ether NULL or an xstrdup()'d string. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/reflog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/reflog.c b/builtin/reflog.c index bd4c669918d..175c83e7cc2 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -653,6 +653,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) should_expire_reflog_ent, reflog_expiry_cleanup, &cb); + free(ref); } return status; } From patchwork Thu Oct 21 15:57:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12575693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC149C433EF for ; Thu, 21 Oct 2021 15:57:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 936FF611CB for ; Thu, 21 Oct 2021 15:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231857AbhJUQAG (ORCPT ); Thu, 21 Oct 2021 12:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231796AbhJUQAC (ORCPT ); Thu, 21 Oct 2021 12:00:02 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57C76C061348 for ; Thu, 21 Oct 2021 08:57:46 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id k7so197942wrd.13 for ; Thu, 21 Oct 2021 08:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sGWPxesBAkE7U2pSHWFVD7qJdDjOphqg3HmGJEDHKSs=; b=MfGKTZpf/k/DE53Fjv1ya/NvPzk3qWNM9H85Nd6TfdRYjMzoH2BVHbUlFLsveYBSd1 MmZWV3uk7QqS+oPn8ts1m6By/kLEGtePc30d3a9UHwz6FuyZRPiLvxlbizeQivYYFiKr WsluZTLAIkJ4uj/AVXFpcPM9umnjkOts4CKCKd5MP5NWiOfdbWk8i9kceFvsWIV013TV fYUr1VN5HxGFDD4Lclv2qiKyT/TffJEAFvKOwqi4XCQQkEGmYyhv6NXhY5kFQiORCnJq WmFAkuaH8LlerFeHfqL3i9Fv1nfR3qh68b927UBTIwXVSAJg5Z0uFHZP6h43K8TG1zOK m7JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sGWPxesBAkE7U2pSHWFVD7qJdDjOphqg3HmGJEDHKSs=; b=7RLQZjcXpQigICPMO/Pn+o7jfCQSl1iO0CmjK6+cJbQYlb6HwxABKXssaWYusRvYef mI9CQD+aCwLOHA7t4k67lk8ogeI3hV1NoWctDZCohAXx6JgVpjVpmIcA2TG+JR+vLL6Q Dvhrm/OjJrkAt0RMal3UGGSSoOOSV0KwWDooTRa7DRKW4mip7hhmNbFYBdc4FJ7O//0G bL8pwDcO+ZTAXnmCb7R3+8qjOfKzF9A+mk/xYYN9i74XCqSW6QA86TIDyOERmGk6lgQS HrpDknUJtbeLZX55hcwiluY2ZKHlhknlAqkzW1s0x50x7WB8ETsgcejhmyMIj3JkhOZy 3fSQ== X-Gm-Message-State: AOAM533zmyECG1SxTqhOLB8PU9NxNR980FZIEzl4x70Vzvc5VgoUTHzP BKuhjwxNHWgtSl/4NS1r/xJvUfFIWLFayA== X-Google-Smtp-Source: ABdhPJwVRTp5JWFgNGZ1LTY307Wr2dd4WO6980MBmIvxTBSAqxeoJe0QUk2qoiBf7KjCq6WTyknNUQ== X-Received: by 2002:adf:80cd:: with SMTP id 71mr4042071wrl.429.1634831864731; Thu, 21 Oct 2021 08:57:44 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z6sm7082259wmp.1.2021.10.21.08.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 08:57:44 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Taylor Blau , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 6/6] repack: stop leaking a "struct child_process" Date: Thu, 21 Oct 2021 17:57:37 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/repack.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/repack.c b/builtin/repack.c index 0b2d1e5d82b..50730517c7b 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -258,9 +258,11 @@ static void repack_promisor_objects(const struct pack_objects_args *args, for_each_packed_object(write_oid, &cmd, FOR_EACH_OBJECT_PROMISOR_ONLY); - if (cmd.in == -1) + if (cmd.in == -1) { + child_process_clear(&cmd); /* No packed objects; cmd was never started */ return; + } close(cmd.in);