From patchwork Mon Nov 28 13:25:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] libstdc++/51288 Date: Mon, 28 Nov 2011 03:25:31 -0000 From: Paolo Carlini X-Patchwork-Id: 127983 Message-Id: <4ED38BCB.40104@oracle.com> To: "gcc-patches@gcc.gnu.org" Cc: libstdc++ Hi, when I implemented get/put_money I gorgot about the sentry, oops. Tested x86_64-linux, committed to mainline. Paolo. ///////////////////// 2011-11-28 Paolo Carlini PR libstdc++/51288 * include/std/iomanip (get_money, put_money): Use sentry. * testsuite/27_io/manipulators/extended/get_money/char/51288.cc: New. * testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc: Likewise. * testsuite/27_io/manipulators/extended/put_money/char/51288.cc: Likewise. * testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc: Likewise. Index: include/std/iomanip =================================================================== --- include/std/iomanip (revision 181773) +++ include/std/iomanip (working copy) @@ -1,7 +1,7 @@ // Standard stream manipulators -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -262,18 +262,29 @@ basic_istream<_CharT, _Traits>& operator>>(basic_istream<_CharT, _Traits>& __is, _Get_money<_MoneyT> __f) { - typedef istreambuf_iterator<_CharT, _Traits> _Iter; - typedef money_get<_CharT, _Iter> _MoneyGet; - - ios_base::iostate __err = ios_base::goodbit; - const _MoneyGet& __mg = use_facet<_MoneyGet>(__is.getloc()); + typename basic_istream<_CharT, _Traits>::sentry __cerb(__is, false); + if (__cerb) + { + ios_base::iostate __err = ios_base::goodbit; + __try + { + typedef istreambuf_iterator<_CharT, _Traits> _Iter; + typedef money_get<_CharT, _Iter> _MoneyGet; - __mg.get(_Iter(__is.rdbuf()), _Iter(), __f._M_intl, - __is, __err, __f._M_mon); - - if (ios_base::goodbit != __err) - __is.setstate(__err); - + const _MoneyGet& __mg = use_facet<_MoneyGet>(__is.getloc()); + __mg.get(_Iter(__is.rdbuf()), _Iter(), __f._M_intl, + __is, __err, __f._M_mon); + } + __catch(__cxxabiv1::__forced_unwind&) + { + __is._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) + { __is._M_setstate(ios_base::badbit); } + if (ios_base::goodbit != __err) + __is.setstate(__err); + } return __is; } @@ -298,16 +309,27 @@ basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, _Put_money<_MoneyT> __f) { - typedef ostreambuf_iterator<_CharT, _Traits> _Iter; - typedef money_put<_CharT, _Iter> _MoneyPut; - - const _MoneyPut& __mp = use_facet<_MoneyPut>(__os.getloc()); - const _Iter __end = __mp.put(_Iter(__os.rdbuf()), __f._M_intl, - __os, __os.fill(), __f._M_mon); - - if (__end.failed()) - __os.setstate(ios_base::badbit); - + typename basic_ostream<_CharT, _Traits>::sentry __cerb(__os); + if (__cerb) + { + __try + { + typedef ostreambuf_iterator<_CharT, _Traits> _Iter; + typedef money_put<_CharT, _Iter> _MoneyPut; + const _MoneyPut& __mp = use_facet<_MoneyPut>(__os.getloc()); + const _Iter __end = __mp.put(_Iter(__os.rdbuf()), __f._M_intl, + __os, __os.fill(), __f._M_mon); + if (__end.failed()) + __os.setstate(ios_base::badbit); + } + __catch(__cxxabiv1::__forced_unwind&) + { + __os._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) + { __os._M_setstate(ios_base::badbit); } + } return __os; } Index: testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc =================================================================== --- testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc (revision 0) +++ testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc (revision 0) @@ -0,0 +1,49 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-namedlocale "en_US.UTF-8" } + +// Copyright (C) 2011 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +// libstdc++/51288 +void test01() +{ + bool test __attribute__((unused)) = true; + + std::locale loc_us = std::locale("en_US.UTF-8"); + + std::wostringstream oss; + oss.imbue(loc_us); + + const std::wstring str(L"123"); + + oss.setstate(std::ios_base::failbit); + + oss << std::put_money(str); + + VERIFY( oss.str().empty() ); + VERIFY( oss.fail() ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/27_io/manipulators/extended/put_money/char/51288.cc =================================================================== --- testsuite/27_io/manipulators/extended/put_money/char/51288.cc (revision 0) +++ testsuite/27_io/manipulators/extended/put_money/char/51288.cc (revision 0) @@ -0,0 +1,49 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-namedlocale "en_US.UTF-8" } + +// Copyright (C) 2011 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +// libstdc++/51288 +void test01() +{ + bool test __attribute__((unused)) = true; + + std::locale loc_us = std::locale("en_US.UTF-8"); + + std::ostringstream oss; + oss.imbue(loc_us); + + const std::string str("123"); + + oss.setstate(std::ios_base::failbit); + + oss << std::put_money(str); + + VERIFY( oss.str().empty() ); + VERIFY( oss.fail() ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc =================================================================== --- testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc (revision 0) +++ testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc (revision 0) @@ -0,0 +1,48 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-namedlocale "en_US.UTF-8" } + +// Copyright (C) 2011 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +// libstdc++/51288 +void test01() +{ + bool test __attribute__((unused)) = true; + + std::locale loc_us = std::locale("en_US.UTF-8"); + + std::wistringstream iss; + iss.imbue(loc_us); + + iss.str(L" $1.23"); + + std::wstring str; + iss >> std::get_money(str); + + VERIFY( str == L"123" ); + VERIFY( iss.eof() ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/27_io/manipulators/extended/get_money/char/51288.cc =================================================================== --- testsuite/27_io/manipulators/extended/get_money/char/51288.cc (revision 0) +++ testsuite/27_io/manipulators/extended/get_money/char/51288.cc (revision 0) @@ -0,0 +1,48 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-namedlocale "en_US.UTF-8" } + +// Copyright (C) 2011 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +// libstdc++/51288 +void test01() +{ + bool test __attribute__((unused)) = true; + + std::locale loc_us = std::locale("en_US.UTF-8"); + + std::istringstream iss; + iss.imbue(loc_us); + + iss.str(" $1.23"); + + std::string str; + iss >> std::get_money(str); + + VERIFY( str == "123" ); + VERIFY( iss.eof() ); +} + +int main() +{ + test01(); + return 0; +}