From patchwork Mon Feb 5 13:27:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 869272 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89966-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="dH3ozIfs"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZpLf0Qtkz9t2l for ; Tue, 6 Feb 2018 00:28:09 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=HD6lFU7n4K20aif7Mwxo58tBeIvPCJD IevpTzG6JxOj3jLoy7gqC11qnhKcN94J58UrX4tQkPTDtOQsJ9I/FZqoT8J8qDRz ncHnxhJcbiLpBiSxFNWbuAgU37NqgMjct+N/UDnXbthpTPdvMlzQ58raBapKnMAM gIyldX9EjaBI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=rJRqwKrm+eQge2FmttgxJRmdlQY=; b=dH3oz IfsKZyv8zPKxtvLjfre8d12ZDFa3H1svH5Oxbn1W4D1NNbMox/FfHjHYlaAFwy5i UV83GU1sgPRAc5vUmgb45oKFbSenhYCC39LPhWDo5D1yUgtGyP7TPQqaS7jmZ9sK Wu/CtGRj8QFADdF+QK91q8ZgZSCCYnA5GUjvsA= Received: (qmail 32606 invoked by alias); 5 Feb 2018 13:27:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 32436 invoked by uid 89); 5 Feb 2018 13:27:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2061, 11986 X-HELO: mail-qt0-f196.google.com 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; bh=SSUJrWbbpI9id/8L9RFSdToPch7srdxwjRZVerMraMY=; b=HPM+Y9Gzaskis5zXsaPpDfipDuxMKw6930VorEfEpIm0iA/UHHYhBNMf73V7/KFdc5 xJM3hK8o3hnT2dXZjFKJaX1WUyILAiMa3VUkVmGv8bzxhUCN6rAYHKt2Xk0CI6eFKyAX nz1/mctcWk1Yo5ZaTCgx4mRa5t3QornEbaorK8eHhmBHvcz0ZxhcmC1lgDyLBHb/Zibm BRL7Iz7X4wUnao8VYP+rChsRJ9Quz5rN8CxOeN/QfWBF8NDv5F/ak2QAUDzkxzhzv2nP nEDFB5kOHjjHJ0OsaY9pKFgohmtzvVwtx3TnQcc7DcSlkjGpmrL/mlKiMroQBSas8ygp I79w== X-Gm-Message-State: AKwxytfLheY5B4Kd213lwYcYjvdkeJV0RIv+CWKTbizFHzkXyE0WjtC+ g1Xj3c5xhjD/n2dncwIXiPf9sUQgoN4= X-Google-Smtp-Source: AH8x226p+QLugD5GLOUgUmV4tu7u3LvNwT5Tt3W2tSTZQN4vQVysr2OYhkdO/m1Feco1nR2RAPjDZw== X-Received: by 10.237.55.132 with SMTP id j4mr32100989qtb.324.1517837267356; Mon, 05 Feb 2018 05:27:47 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 04/12] posix: Remove alloca usage on glob dirname Date: Mon, 5 Feb 2018 11:27:26 -0200 Message-Id: <1517837254-19399-5-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1517837254-19399-1-git-send-email-adhemerval.zanella@linaro.org> References: <1517837254-19399-1-git-send-email-adhemerval.zanella@linaro.org> This patch replaces the alloca/malloc usage for dirname creation by the char_array struct. Checked on x86_64-linux-gnu. * posix/glob.c (glob_in_dir): Remove alloca usage for fullname. Signed-off-by: Adhemerval Zanella --- ChangeLog | 2 ++ posix/glob.c | 28 +++++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/posix/glob.c b/posix/glob.c index 3e36eeb..26af331 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -1198,7 +1198,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]; @@ -1230,32 +1229,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 {