From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, FORGED_GMAIL_RCVD,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 dcvr.yhbt.net (Postfix) with ESMTPS id 9C1E21F462 for ; Wed, 22 May 2019 22:41:10 +0000 (UTC) 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:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=hAj rLF3QJ6tFtrk32z4MO6O+GV5/j3IS4UPxTSbRlqwmLshzxI15kqBKT3luYZwLNE7 9XGs6RpYx8ZpIBp/NrO5PFWw6QpU+736u+xzspUGUvQwUGsF4dgOixRRq+/KpX8O OOZ4Zie/6jEa3rhI8URAQP5/TuxRJ0Dchtu/gRoY= 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:mime-version :content-type:content-transfer-encoding; s=default; bh=+/mEcLdS5 Du7gWRyjLwv7e2mXC4=; b=pJmYRTTvX8QsrklH4ItMkZATjkR9ANfnB1bejwYZW 0twnKahOCG0PxuF2+WMCmeZ2MTTA9gRdgLI3/sjC0iNNx4us5yXt7ZwaO1WoT0Kn KIjmVpwKee8wpSIiyttI6UVkAYi57qcZmr5U+vExT035CWRTYtdX/O7a6b7t5ebi W0= Received: (qmail 80492 invoked by alias); 22 May 2019 22:40:58 -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 Received: (qmail 80413 invoked by uid 89); 22 May 2019 22:40:58 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mga02.intel.com From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH] Don't pass NULL pointer to error [BZ #24556] Date: Wed, 22 May 2019 15:40:53 -0700 Message-Id: <20190522224053.15351-1-hjl.tools@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 9 with -O3 will issue a warning for passing NULL pointer to ‘%s': In file included from ../include/bits/error.h:1, from ../misc/error.h:57, from ../include/error.h:2, from bench-string.h:60, from bench-strstr.c:22: In function ‘error’, inlined from ‘do_one_test’ at bench-strstr.c:149:7, inlined from ‘do_test’ at bench-strstr.c:201:5, inlined from ‘test_main’ at bench-strstr.c:220:2: ../include/bits/../../misc/bits/error.h:42:5: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 42 | __error_alias (__status, __errnum, __format, __va_arg_pack ()); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In function ‘error’, inlined from ‘do_one_test’ at bench-strstr.c:149:7, inlined from ‘do_test’ at bench-strstr.c:201:5, inlined from ‘test_main’ at bench-strstr.c:227:2: ../include/bits/../../misc/bits/error.h:42:5: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 42 | __error_alias (__status, __errnum, __format, __va_arg_pack ()); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors We can either disable -Werror=format-overflow= or don't pass NULL pointer to error. This patch does the latter. [BZ #24556] * benchtests/bench-strstr.c (do_one_test): Don't pass NULL pointer to error. --- benchtests/bench-strstr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchtests/bench-strstr.c b/benchtests/bench-strstr.c index b4cd141083..104dd979f0 100644 --- a/benchtests/bench-strstr.c +++ b/benchtests/bench-strstr.c @@ -147,7 +147,7 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result) if (res != exp_result) { error (0, 0, "Wrong result in function %s %s %s", impl->name, - res, exp_result); + res, exp_result ? exp_result : "(null)"); ret = 1; } } -- 2.20.1