From patchwork Wed Jul 12 17:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 72565 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D7442385841F for ; Wed, 12 Jul 2023 17:02:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7442385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689181365; bh=vbmPCobTitR1MX4QyDwLEjZML0eLGDVm8eGSDgKKUOE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=V3JGaCZug2C+ctzr4zh/veE+GhhTKbkE2xS516H/LJ1tjDzgCt6Y2wFHlAewXPsQS 40x3degqYoACNMfK3QzvXmGrQJ4tTMeEY2olNmjMjJvQEIE3Q7Lr4VlwZmbNZNizzy XubeItPpst1KeyGLUcUGmrZUh36lV066ga0T6J1Y= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0E6853858D20 for ; Wed, 12 Jul 2023 17:02:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0E6853858D20 Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-54-cJm5IC6DMqGjM6V9qORwQw-1; Wed, 12 Jul 2023 13:02:10 -0400 X-MC-Unique: cJm5IC6DMqGjM6V9qORwQw-1 Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-78f620ab3fdso1352081241.3 for ; Wed, 12 Jul 2023 10:02:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689181329; x=1691773329; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vbmPCobTitR1MX4QyDwLEjZML0eLGDVm8eGSDgKKUOE=; b=laLfr/gqVBzdPp0MiQdwoNfwC9WXD9cKgwZ+mPGtTh0Za5sEDFLe1Uu5oddgWvMC73 FOaDJrzObYcZd3SOxid1h8b8g6SfFrfcb54O97R4CWQ8d5KfuPMDsxuxcIFoMDk9sQDt m7YfyCxE+Fvpq514BXs7Xjr3LFpnpmH6a0EWYVvW2+AQMgPyfib2YZh42xr0jzc+b8uO lmkogv+9yZXE0fTA9r+6va1w+kPneCxYnFl57MLTAfOU2ceWAX1J1H/1HfeJY1PJy98/ FW+xUgLN2bb/lVV7FlB7bFkFCmbJ/KlxdiQBHTuFC8NlWmgCizTV4DxBTjCepj35CZVc XN4A== X-Gm-Message-State: ABy/qLbGlU01RYUtXhRstNUHlrVJv9okF4hCPfMdyQvnI8owuJDnn3Rm LAv0YQj49y2QUGmLWn4U7FECuExEZ1oPri0XhqKbHo/TnU1kgyEmQlChEzFXbhU8iJLQScF4aXF CAAR9+sKgVo76arW/P/nLkEUb3Za9+bqzZvRsU/d3WdHZWpuRzO91sOcMXNcI9ikamzu880BS6K lBxfvl X-Received: by 2002:a67:ffc2:0:b0:446:8d60:3513 with SMTP id w2-20020a67ffc2000000b004468d603513mr2957139vsq.10.1689181329200; Wed, 12 Jul 2023 10:02:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlE5qXpwvCujtalO5ngiJCcY4pkkFVyuDskPxXOig3J20c1vGL6uI2K7rzkyFTBIvV1SyIRdEw== X-Received: by 2002:a67:ffc2:0:b0:446:8d60:3513 with SMTP id w2-20020a67ffc2000000b004468d603513mr2957115vsq.10.1689181328855; Wed, 12 Jul 2023 10:02:08 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id g18-20020a05620a13d200b00767cd2dbd82sm2278583qkl.15.2023.07.12.10.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 10:02:08 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH] argp-help: Get rid of alloca. Date: Wed, 12 Jul 2023 13:02:06 -0400 Message-Id: <20230712170206.3675587-1-josimmon@redhat.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Replace alloca with a scratch_buffer to avoid potential stack overflow. Checked on x86_64-linux-gnu --- argp/argp-help.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/argp/argp-help.c b/argp/argp-help.c index d019ed58d2..a5982334f6 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -40,6 +40,7 @@ char *alloca (); # endif #endif +#include #include #include #include @@ -1450,8 +1451,17 @@ hol_usage (struct hol *hol, argp_fmtstream_t stream) { unsigned nentries; struct hol_entry *entry; - char *short_no_arg_opts = alloca (strlen (hol->short_options) + 1); - char *snao_end = short_no_arg_opts; + struct scratch_buffer buf; + scratch_buffer_init (&buf); + char *short_no_arg_opts; + char *snao_end; + + if (!scratch_buffer_set_array_size (&buf, 1, + strlen (hol->short_options) + 1)) + return; + short_no_arg_opts = buf.data; + snao_end = short_no_arg_opts; + /* First we put a list of short options without arguments. */ for (entry = hol->entries, nentries = hol->num_entries @@ -1478,6 +1488,8 @@ hol_usage (struct hol *hol, argp_fmtstream_t stream) ; entry++, nentries--) hol_entry_long_iterate (entry, usage_long_opt, entry->argp->argp_domain, stream); + + scratch_buffer_free (&buf); } } @@ -1698,7 +1710,13 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, { int first_pattern = 1, more_patterns; size_t num_pattern_levels = argp_args_levels (argp); - char *pattern_levels = alloca (num_pattern_levels); + struct scratch_buffer buf; + scratch_buffer_init (&buf); + char *pattern_levels; + + if (!scratch_buffer_set_array_size (&buf, 1, num_pattern_levels)) + return; + pattern_levels = buf.data; memset (pattern_levels, 0, num_pattern_levels); @@ -1746,6 +1764,8 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, first_pattern = 0; } while (more_patterns); + + scratch_buffer_free (&buf); } if (flags & ARGP_HELP_PRE_DOC)