From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 00C581F5A0 for ; Wed, 18 Jan 2023 12:47:41 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=YIeuXamO; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230477AbjARMrM (ORCPT ); Wed, 18 Jan 2023 07:47:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbjARMqN (ORCPT ); Wed, 18 Jan 2023 07:46:13 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D17FA1DB9D for ; Wed, 18 Jan 2023 04:08:46 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id y19so15755739edc.2 for ; Wed, 18 Jan 2023 04:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J2fJJud2NPAFFQ9AJyYBbG+qE8iKqwaUyGWWhxkOPUM=; b=YIeuXamOH2M2fM4koi43DA3gMnmc104ijJWkowuZO/fSKDmRbST+BQ0qxVM8lHl1Cj LAcKuNkr6+6fD5tDWE9n2cidMmSJRzlHwTaywfmX+Bw0EZi1eHWYZw/V8ZdUYlo2Je/9 OssighjBcwdyfQvCV+y6d8xove/ufI9yX7IGBn5KanbRDrwPEAfgNEgWhGzbNnlq3VGq NLZCF+bfFHWITiRkL55nNRy7TYF8+qaA5CFwiIOgx6E3jZBRRfEN7kb3vQ+7mLcAXOZG uqu5LvxTZzLQMgdKdDrpwB0yXkqOUkk5hW1XhxJWjwTbz0M9oyjRQKeUaaKmc8RUflLg YmaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J2fJJud2NPAFFQ9AJyYBbG+qE8iKqwaUyGWWhxkOPUM=; b=OJ54E1rhM9VWaB+3sFetapYHf7+db32V3/DM+4lRaw78QomsmXIkxTubpKRt46hTbF 3x4DwTifGm2IhhhMaNweC1vZ0vUvAq99NJ3pXaH3p/JnBRsLIiKE50aS3e7dLTJMo8xK f4r8CWNHDaN/YD57L03TRO2NizcpTZMWXfdtk+yzYLsv+bRueMFiA5E6xAuuFkiPN83K 06euqWcPT+PAxRfjeXCMnqNeqszHERqdyi+0SGcLw4NGUhWz89oJE6T9546MzPyYi0bW 0DIwF8UbNs+ZiCBHyqYQRK39jVs1BcOPd6QE9Wpt54kWcO/8QUJ8xarZKI+5u3pcv/UZ 7vpA== X-Gm-Message-State: AFqh2ko2i93rCvU6GpqrToQERH6eybyw9QKKaY9fs05PblSZzv5730Yr nGfSya+bNpFzxlLWQHjDjnyS8dGenp2/Zw== X-Google-Smtp-Source: AMrXdXvSewyurShwgltlKzx0/nYgEtPZdxs1fhLHmcwkOwZDRAsYC+5FP5DPQ+9ZlqZwIlk0yuraTg== X-Received: by 2002:a05:6402:60b:b0:470:25cf:99d1 with SMTP id n11-20020a056402060b00b0047025cf99d1mr6974941edv.31.1674043724266; Wed, 18 Jan 2023 04:08:44 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b15-20020aa7c90f000000b004615f7495e0sm14120053edt.8.2023.01.18.04.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 04:08:43 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: =?UTF-8?q?Ren=C3=A9=20Scharfe?= , Junio C Hamano , Eric Sunshine , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v5 11/19] commit-graph: fix a parse_options_concat() leak Date: Wed, 18 Jan 2023 13:08:24 +0100 Message-Id: X-Mailer: git-send-email 2.39.0.1225.g30a3d88132d In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When the parse_options_concat() was added to this file in 84e4484f128 (commit-graph: use parse_options_concat(), 2021-08-23) we wouldn't free() it if we returned early in these cases. Since "result" is 0 by default we can "goto cleanup" in both cases, and only need to set "result" if write_commit_graph_reachable() fails. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/commit-graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 0102ac8540e..93704f95a9d 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -269,8 +269,8 @@ static int graph_write(int argc, const char **argv, const char *prefix) if (opts.reachable) { if (write_commit_graph_reachable(odb, flags, &write_opts)) - return 1; - return 0; + result = 1; + goto cleanup; } if (opts.stdin_packs) { -- 2.39.0.1225.g30a3d88132d