From patchwork Tue Jan 5 18:58:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 41645 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 129C2393C858; Tue, 5 Jan 2021 18:58:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 129C2393C858 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609873117; bh=FMizFL2ZyfDqY8Subj3AWHoI48LSDGN2hqNvtiPxCPE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=cHR3ICGUyZsTQ+4TOgbZOMPmKOGNBbozPyn3BY4GkqG0LX2mUAEBrVwXj1SDA+x9e aoTmOjnAMURWomm84MMlZzj3tX2QzhSCPozY/C3O95olU48Mrng6JyoiE8zIJiFWX0 +IiAKes6O2WK8nQjtCh84DzrLgDoXfqcu8JNrSD0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by sourceware.org (Postfix) with ESMTPS id E9037384B00F for ; Tue, 5 Jan 2021 18:58:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E9037384B00F Received: by mail-qk1-x729.google.com with SMTP id v126so268114qkd.11 for ; Tue, 05 Jan 2021 10:58:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FMizFL2ZyfDqY8Subj3AWHoI48LSDGN2hqNvtiPxCPE=; b=f+KgvkjIne+6oyK5hN/Et5Mnky2awhEUcTbYjx+qZkJuuOSHclMxF0q0UaVWtuNek3 9jGWVkzNwpsiL+weEaDh6nyJvGXzgJaiPwj3UDVBzS9vQ7qo7kYKRE9lqPS+hKZLOweV wttHEbmhBHHffwLsJrpYgvRlVBcd1zhiqZNEJNLcv6RuEiqOs+PZdPEKKw76uAku1Rc5 Ya24OkDRN4ti6tFXP04336pfavLUztRnpLUQdFelTesfAPC5/NMRh0wKSH8yI643JL/Y 1/8fuMwEDiXoF9fIyBBZMTTgiSvd+JTQc7xxuDZTUj/fVVERjCC6wfSgY9nksP4TOHSJ fDcQ== X-Gm-Message-State: AOAM532kvRb4QwqPkjQYVY7o9jGToKas2fQQ+XmPBJqZWkDJDRUUPPDj AA1gxrq88TlCuw5UPLJxtyLdGDG+FiHSoQ== X-Google-Smtp-Source: ABdhPJy6pSH7pujLlSTb0WaxCwLxB7eZqbE/JHnTl+1vitE93ts7R1etYOhaNnbC2nan2TXL4ysmtA== X-Received: by 2002:a37:c0d:: with SMTP id 13mr877628qkm.275.1609873113433; Tue, 05 Jan 2021 10:58:33 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id t68sm67792qkd.35.2021.01.05.10.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 10:58:33 -0800 (PST) To: libc-alpha@sourceware.org, Paul Eggert , bug-gnulib@gnu.org Subject: [PATCH 4/8] posix: Remove alloca usage on glob dirname Date: Tue, 5 Jan 2021 15:58:16 -0300 Message-Id: <20210105185820.3796657-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105185820.3796657-1-adhemerval.zanella@linaro.org> References: <20210105185820.3796657-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This patch replaces the alloca/malloc usage for dirname creation by the char_array struct. Checked on x86_64-linux-gnu. --- posix/glob.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/posix/glob.c b/posix/glob.c index 41e1aeacad..d734ca977c 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -1212,7 +1212,6 @@ glob_in_dir (const char *pattern, const char *directory, int flags, int (*errfunc) (const char *, int), glob_t *pglob, size_t alloca_used) { - size_t dirlen = strlen (directory); void *stream = NULL; # define GLOBNAMES_MEMBERS(nnames) \ struct globnames *next; size_t count; char *name[nnames]; @@ -1244,32 +1243,23 @@ glob_in_dir (const char *pattern, const char *directory, int flags, } else if (meta == GLOBPAT_NONE) { - size_t patlen = strlen (pattern); - size_t fullsize; - bool alloca_fullname - = (! size_add_wrapv (dirlen + 1, patlen + 1, &fullsize) - && glob_use_alloca (alloca_used, fullsize)); - char *fullname; - if (alloca_fullname) - fullname = alloca_account (fullsize, alloca_used); - else + struct char_array fullname; + + if (!char_array_init_str (&fullname, directory) + || !char_array_append_str (&fullname, "/") + || !char_array_append_str (&fullname, pattern)) { - fullname = malloc (fullsize); - if (fullname == NULL) - return GLOB_NOSPACE; + char_array_free (&fullname); + return GLOB_NOSPACE; } - mempcpy (mempcpy (mempcpy (fullname, directory, dirlen), - "/", 1), - pattern, patlen + 1); - if (glob_lstat (pglob, flags, fullname) == 0 + if (glob_lstat (pglob, flags, char_array_str (&fullname)) == 0 || errno == EOVERFLOW) /* We found this file to be existing. Now tell the rest of the function to copy this name into the result. */ flags |= GLOB_NOCHECK; - if (__glibc_unlikely (!alloca_fullname)) - free (fullname); + char_array_free (&fullname); } else {