From patchwork Fri Jul 15 13:16:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 56094 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 97F7F3857831 for ; Fri, 15 Jul 2022 13:16:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 97F7F3857831 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1657891003; bh=ZSrWTGkGzG32H+2v1Emnpp+K/rtNredx53/0MJRS5XE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=l4pliOZKauei9G6dh47fsx2YIP8rbebwQ3G4CAafk4RWaya6TuJK7uQybhgOTxuFK PTwe6Je1brNNE8FkvLQkejQZu4u1kPKMF0uvL2AaJiU2zMqDO9yTP3JhKs4XCTfzv1 IN+zj+MFhtDzG+hS6mwrxdotCSJ5cA3/keDJZug4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id ABA283857BB2 for ; Fri, 15 Jul 2022 13:16:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ABA283857BB2 Received: by mail-ot1-x334.google.com with SMTP id cb12-20020a056830618c00b00616b871cef3so3462231otb.5 for ; Fri, 15 Jul 2022 06:16:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZSrWTGkGzG32H+2v1Emnpp+K/rtNredx53/0MJRS5XE=; b=j0olBNzeRzX6Nwnq83TCxJ5YWSoicMFl5V1j6zPds3LnyWJak7NpWm81beQoCcNbO7 HIOWEHsqhy7h0lf6j7VgQpOKVaoiHt3zza2iKEBhH8TocJ4lMsgGjmqc5yDFoz65w+Uc qrjka2To9rJNCnzJNI8D3cR113WNDQrhZkmpzv8S5rcjOnc/7R9eNWTUrDQhQS3i8H/b hQquxzkMVfvIVA5juEuihHHRzK7grwpKMRHq8UsJC7uXEMpimHMfbjapBa+jIcnWfPb4 grSWEch8QhmoeJQckFt6Pg+iR/ru00Xw5yUyG1H845dvmf6Oa5hJEEVTYNJKRTDyqypm tqOA== X-Gm-Message-State: AJIora84yXUgYaNHnsbuQtWtRCP5LlW29AACO9TL2/6lW6+wspgzKeUw JFMD2PlDpWyNr6HP7hGWDOjNeJWKNEp2yg== X-Google-Smtp-Source: AGRyM1tBfARP61qTZEh6z3xDrY2WBtmXiTjRj8rGq4GqpyLsJ5CEmCXWFN3N24QeaPibi0B3n/4JDg== X-Received: by 2002:a9d:f62:0:b0:610:417c:807b with SMTP id 89-20020a9d0f62000000b00610417c807bmr5574784ott.93.1657890981398; Fri, 15 Jul 2022 06:16:21 -0700 (PDT) Received: from mandiga.. ([2804:431:c7ca:19c3:8b76:f31f:6f6b:bb96]) by smtp.gmail.com with ESMTPSA id 1-20020a4a0301000000b004357c1d1efasm651136ooi.21.2022.07.15.06.16.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 06:16:20 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] elf: Fix wrong fscanf usage on tst-pldd Date: Fri, 15 Jul 2022 10:16:09 -0300 Message-Id: <20220715131609.2666674-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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.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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The fix done b2cd93fce666fdc8c9a5c64af2741a8a6940ac99 does not really work since macro strification does not expand the sizeof nor the arithmetic operation. Checked on x86_64-linux-gnu. --- elf/tst-pldd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/elf/tst-pldd.c b/elf/tst-pldd.c index 0616545b1d..9f633d41a2 100644 --- a/elf/tst-pldd.c +++ b/elf/tst-pldd.c @@ -108,15 +108,16 @@ do_test (void) loader and libc. */ { pid_t pid; - char buffer[512]; -#define STRINPUT(size) "%" # size "s" +#define BUFFERLEN 511 + char buffer[BUFFERLEN + 1]; +#define STRINPUT(size) XSTRINPUT(size) +#define XSTRINPUT(size) "%" # size "s" FILE *out = fmemopen (pldd.out.buffer, pldd.out.length, "r"); TEST_VERIFY (out != NULL); /* First line is in the form of : */ - TEST_COMPARE (fscanf (out, "%u: " STRINPUT (sizeof (buffer) - 1), &pid, - buffer), 2); + TEST_COMPARE (fscanf (out, "%u: " STRINPUT (BUFFERLEN), &pid, buffer), 2); TEST_COMPARE (pid, *target_pid_ptr); TEST_COMPARE (strcmp (basename (buffer), "tst-pldd"), 0);