From 4a78d8641cda5c1b9b324056b6847fc2bb711f97 Mon Sep 17 00:00:00 2001 From: "Loren J. Rittle" Date: Fri, 1 Feb 2002 00:24:12 +0000 Subject: [PATCH] codecvt_members_char_char.cc: Do not allow NULL argument to be passed to setenv(). * testsuite/22_locale/codecvt_members_char_char.cc: Do not allow NULL argument to be passed to setenv(). * testsuite/22_locale/codecvt_members_wchar_t_char.cc: Likewise. * testsuite/22_locale/collate_members_char.cc: Likewise. * testsuite/22_locale/collate_members_wchar_t.cc: Likewise. * testsuite/22_locale/ctype_members_char.cc: Likewise. * testsuite/22_locale/ctype_members_wchar_t.cc: Likewise. * testsuite/22_locale/messages_members_char.cc: Likewise. * testsuite/22_locale/money_get_members_char.cc: Likewise. * testsuite/22_locale/money_get_members_wchar_t.cc: Likewise. * testsuite/22_locale/money_put_members_char.cc: Likewise. * testsuite/22_locale/money_put_members_wchar_t.cc: Likewise. * testsuite/22_locale/moneypunct_members_char.cc: Likewise. * testsuite/22_locale/moneypunct_members_wchar_t.cc: Likewise. * testsuite/22_locale/num_get_members_char.cc: Likewise. * testsuite/22_locale/num_get_members_wchar_t.cc: Likewise. * testsuite/22_locale/num_put_members_char.cc: Likewise. * testsuite/22_locale/num_put_members_wchar_t.cc: Likewise. * testsuite/22_locale/numpunct_members_char.cc: Likewise. * testsuite/22_locale/numpunct_members_wchar_t.cc: Likewise. * testsuite/22_locale/time_get_members_char.cc: Likewise. * testsuite/22_locale/time_get_members_wchar_t.cc: Likewise. * testsuite/22_locale/time_put_members_char.cc: Likewise. * testsuite/22_locale/time_put_members_wchar_t.cc: Likewise. From-SVN: r49384 --- libstdc++-v3/ChangeLog | 27 +++++++++++++++++++ .../22_locale/codecvt_members_char_char.cc | 2 +- .../22_locale/codecvt_members_wchar_t_char.cc | 2 +- .../22_locale/collate_members_char.cc | 2 +- .../22_locale/collate_members_wchar_t.cc | 2 +- .../testsuite/22_locale/ctype_members_char.cc | 2 +- .../22_locale/ctype_members_wchar_t.cc | 2 +- .../22_locale/messages_members_char.cc | 2 +- .../22_locale/money_get_members_char.cc | 2 +- .../22_locale/money_get_members_wchar_t.cc | 2 +- .../22_locale/money_put_members_char.cc | 2 +- .../22_locale/money_put_members_wchar_t.cc | 2 +- .../22_locale/moneypunct_members_char.cc | 2 +- .../22_locale/moneypunct_members_wchar_t.cc | 2 +- .../22_locale/num_get_members_char.cc | 2 +- .../22_locale/num_get_members_wchar_t.cc | 2 +- .../22_locale/num_put_members_char.cc | 2 +- .../22_locale/num_put_members_wchar_t.cc | 2 +- .../22_locale/numpunct_members_char.cc | 2 +- .../22_locale/numpunct_members_wchar_t.cc | 2 +- .../22_locale/time_get_members_char.cc | 2 +- .../22_locale/time_get_members_wchar_t.cc | 2 +- .../22_locale/time_put_members_char.cc | 2 +- .../22_locale/time_put_members_wchar_t.cc | 2 +- 24 files changed, 50 insertions(+), 23 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d0133ea587f..da392ff6a41 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,30 @@ +2002-01-31 Loren Rittle + + * testsuite/22_locale/codecvt_members_char_char.cc: Do not + allow NULL argument to be passed to setenv(). + * testsuite/22_locale/codecvt_members_wchar_t_char.cc: Likewise. + * testsuite/22_locale/collate_members_char.cc: Likewise. + * testsuite/22_locale/collate_members_wchar_t.cc: Likewise. + * testsuite/22_locale/ctype_members_char.cc: Likewise. + * testsuite/22_locale/ctype_members_wchar_t.cc: Likewise. + * testsuite/22_locale/messages_members_char.cc: Likewise. + * testsuite/22_locale/money_get_members_char.cc: Likewise. + * testsuite/22_locale/money_get_members_wchar_t.cc: Likewise. + * testsuite/22_locale/money_put_members_char.cc: Likewise. + * testsuite/22_locale/money_put_members_wchar_t.cc: Likewise. + * testsuite/22_locale/moneypunct_members_char.cc: Likewise. + * testsuite/22_locale/moneypunct_members_wchar_t.cc: Likewise. + * testsuite/22_locale/num_get_members_char.cc: Likewise. + * testsuite/22_locale/num_get_members_wchar_t.cc: Likewise. + * testsuite/22_locale/num_put_members_char.cc: Likewise. + * testsuite/22_locale/num_put_members_wchar_t.cc: Likewise. + * testsuite/22_locale/numpunct_members_char.cc: Likewise. + * testsuite/22_locale/numpunct_members_wchar_t.cc: Likewise. + * testsuite/22_locale/time_get_members_char.cc: Likewise. + * testsuite/22_locale/time_get_members_wchar_t.cc: Likewise. + * testsuite/22_locale/time_put_members_char.cc: Likewise. + * testsuite/22_locale/time_put_members_wchar_t.cc: Likewise. + 2002-01-30 Benjamin Kosnik * config/locale/c_locale_gnu.cc: Same errno fixes as generic. diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc index 97c4201ee31..8b3dfc6d190 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc @@ -92,7 +92,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_members_wchar_t_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_members_wchar_t_char.cc index e9ce1b2c63c..9ff83e9069a 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_members_wchar_t_char.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_members_wchar_t_char.cc @@ -124,7 +124,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/collate_members_char.cc b/libstdc++-v3/testsuite/22_locale/collate_members_char.cc index 92c4d3c73b0..ab5fe197dd0 100644 --- a/libstdc++-v3/testsuite/22_locale/collate_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/collate_members_char.cc @@ -142,7 +142,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc index f9c2bd97c39..3eba87af31c 100644 --- a/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc @@ -142,7 +142,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/ctype_members_char.cc b/libstdc++-v3/testsuite/22_locale/ctype_members_char.cc index 96ccafb35b7..cc69094c345 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype_members_char.cc @@ -257,7 +257,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/ctype_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/ctype_members_wchar_t.cc index 448d937f0c4..aac23dc5a92 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype_members_wchar_t.cc @@ -110,7 +110,7 @@ void test03() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/messages_members_char.cc b/libstdc++-v3/testsuite/22_locale/messages_members_char.cc index 405e4ee5379..d37a86e7720 100644 --- a/libstdc++-v3/testsuite/22_locale/messages_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/messages_members_char.cc @@ -94,7 +94,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc index 4ec1b3fa7a2..705d8741fc6 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc @@ -304,7 +304,7 @@ void test04() test01(); test02(); test03(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc index 2fd8d6689e5..0e892e7f5e6 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc @@ -306,7 +306,7 @@ void test04() test01(); test02(); test03(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc index ad47695c797..eefd1c2df58 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc @@ -298,7 +298,7 @@ void test04() test01(); test02(); test03(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc index 2e2f31ddb86..0103bc41133 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc @@ -298,7 +298,7 @@ void test04() test01(); test02(); test03(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc index 9260ea5d587..3d4f5a0968b 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc @@ -118,7 +118,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc index a301b270ed6..f3b2f0c3908 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc @@ -119,7 +119,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc b/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc index 53b4b70a827..1c9d8f08996 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc @@ -327,7 +327,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc index 2b4ad35aa0c..53fb9c9df77 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc @@ -329,7 +329,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc index 0e2836d2717..8505566be16 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc @@ -305,7 +305,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc index 5a918132612..d2309f0d434 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc @@ -305,7 +305,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc b/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc index 04657eb4841..fa71a90e825 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc @@ -96,7 +96,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/numpunct_members_wchar_t.cc index 8aea0f07bb5..ec2337cd076 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct_members_wchar_t.cc @@ -94,7 +94,7 @@ void test02() if (!setenv("LANG", "de_DE", 1)) { test01(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/time_get_members_char.cc b/libstdc++-v3/testsuite/22_locale/time_get_members_char.cc index 9e9891d2158..2ba8cca272f 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get_members_char.cc @@ -694,7 +694,7 @@ void test07() test04(); test05(); test06(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/time_get_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/time_get_members_wchar_t.cc index 7a97d6ad582..27530935b3c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get_members_wchar_t.cc @@ -694,7 +694,7 @@ void test07() test04(); test05(); test06(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc index e01b3245686..e3c4e2552c4 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put_members_char.cc @@ -245,7 +245,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif } diff --git a/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc index 8f82dc7afb8..a2bfd7d3d1a 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc @@ -247,7 +247,7 @@ void test03() { test01(); test02(); - setenv("LANG", oldLANG, 1); + setenv("LANG", oldLANG ? oldLANG : "", 1); } #endif }