From 55925fe3a97c38eb770a9839916d61b219b90d00 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 12 Mar 2020 17:39:05 +0000 Subject: [PATCH] libstdc++: Fix test failure due to -Wnonnull warnings This test fails in the Fedora RPM build (but not elsewhere, for unknown reasons). The warning is correct, we're passing a null pointer. Backport from mainline 2020-03-12 Jonathan Wakely * testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Do not pass a null pointer to functions with nonnull(1) attribute. --- libstdc++-v3/ChangeLog | 6 ++++++ .../testsuite/tr1/8_c_compatibility/cstdlib/functions.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7608f7028f61..fd80d5d091ff 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2020-03-12 Jonathan Wakely + Backport from mainline + 2020-03-12 Jonathan Wakely + + * testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Do not pass + a null pointer to functions with nonnull(1) attribute. + Backport from mainline 2020-02-28 Jonathan Wakely diff --git a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdlib/functions.cc b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdlib/functions.cc index e1feef995823..0f00a94da423 100644 --- a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdlib/functions.cc +++ b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdlib/functions.cc @@ -30,7 +30,7 @@ void test01() #if _GLIBCXX_USE_C99_STDLIB long long i = 0; - const char* s = 0; + const char* s = ""; char** endptr = 0; int base = 0; -- 2.47.2