Commit 4fb19532 by Paolo Carlini Committed by Paolo Carlini

ostream.tcc (operator<<(basic_ostream<>&, const char*)): Further fix for throwing widen.

2006-10-14  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/ostream.tcc (operator<<(basic_ostream<>&,
	const char*)): Further fix for throwing widen.

From-SVN: r117730
parent 78a438f1
2006-10-14 Paolo Carlini <pcarlini@suse.de> 2006-10-14 Paolo Carlini <pcarlini@suse.de>
* include/bits/ostream.tcc (operator<<(basic_ostream<>&, * include/bits/ostream.tcc (operator<<(basic_ostream<>&,
const char*)): Further fix for throwing widen.
2006-10-14 Paolo Carlini <pcarlini@suse.de>
* include/bits/ostream.tcc (operator<<(basic_ostream<>&,
const char*)): Fix thinko in change for libstdc++/28277, const char*)): Fix thinko in change for libstdc++/28277,
avoid memory leaks. avoid memory leaks.
......
...@@ -325,17 +325,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -325,17 +325,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const size_t __clen = char_traits<char>::length(__s); const size_t __clen = char_traits<char>::length(__s);
_CharT* __ws = 0; _CharT* __ws = 0;
try try
{ __ws = new _CharT[__clen]; } {
__ws = new _CharT[__clen];
for (size_t __i = 0; __i < __clen; ++__i)
__ws[__i] = __out.widen(__s[__i]);
}
catch(...) catch(...)
{ {
delete [] __ws;
__out._M_setstate(ios_base::badbit); __out._M_setstate(ios_base::badbit);
return __out; return __out;
} }
try try
{ {
for (size_t __i = 0; __i < __clen; ++__i)
__ws[__i] = __out.widen(__s[__i]);
__out._M_insert(__ws, __clen); __out._M_insert(__ws, __clen);
delete [] __ws; delete [] __ws;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment