+2011-02-28 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR libstdc++/47921
+ * include/std/streambuf (basic_streambuf<>::__safe_gbump,
+ __safe_pbump): Add.
+ * include/bits/streambuf.tcc (basic_streambuf<>::xgetn,
+ xputn): Use the latter.
+ * include/bits/streambuf_iterator.h: Likewise.
+ * src/strstream.cc: Likewise.
+ * src/streambuf.cc: Likewise.
+ * src/compatibility.cc: Likewise.
+ * src/istream.cc: Likewise.
+ * include/bits/fstream.tcc (basic_filebuf<>::xsgetn): Use setg
+ instead of gbump.
+ * include/std/sstream (basic_stringbuf<>::_M_pbump): Add.
+ * include/bits/sstream.tcc (basic_stringbuf<>::seekoff,
+ seekpos, _M_sync): Use setg, setp, and _M_pbump.
+ * config/abi/pre/gnu.ver: Tweak.
+
2011-02-28 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/20_util/ratio/comparisons/comp3.cc: New.
_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE3strERKSs;
_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE3strERKSbIwS1_S2_E;
_ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9][t-z]*;
- _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9]_M_[a-z]*;
+ _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9]_M_[a-o]*;
+ _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9]_M_[q-z]*;
_ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9][0-9]_M_[a-z]*;
# std::basic_iostream constructors, destructors
const streamsize __avail = this->egptr() - this->gptr();
if (__avail != 0)
{
- if (__avail == 1)
- *__s = *this->gptr();
- else
- traits_type::copy(__s, this->gptr(), __avail);
+ traits_type::copy(__s, this->gptr(), __avail);
__s += __avail;
- this->gbump(__avail);
- __ret += __avail;
- __n -= __avail;
+ this->setg(this->eback(), this->gptr() + __avail,
+ this->egptr());
+ __ret += __avail;
+ __n -= __avail;
}
// Need to loop in case of short reads (relatively common
// String based streams -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007, 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
&& __newoffi >= 0
&& this->egptr() - __beg >= __newoffi)
{
- this->gbump((__beg + __newoffi) - this->gptr());
+ this->setg(this->eback(), this->eback() + __newoffi,
+ this->egptr());
__ret = pos_type(__newoffi);
}
if ((__testout || __testboth)
&& __newoffo >= 0
&& this->egptr() - __beg >= __newoffo)
{
- this->pbump((__beg + __newoffo) - this->pptr());
+ _M_pbump(this->pbase(), this->epptr(), __newoffo);
__ret = pos_type(__newoffo);
}
}
if (__testpos)
{
if (__testin)
- this->gbump((__beg + __pos) - this->gptr());
+ this->setg(this->eback(), this->eback() + __pos,
+ this->egptr());
if (__testout)
- this->pbump((__beg + __pos) - this->pptr());
+ _M_pbump(this->pbase(), this->epptr(), __pos);
__ret = __sp;
}
}
this->setg(__base, __base + __i, __endg);
if (__testout)
{
- this->setp(__base, __endp);
- this->pbump(__o);
+ _M_pbump(__base, __endp, __o);
// egptr() always tracks the string end. When !__testin,
// for the correct functioning of the streambuf inlines
// the other get area pointers are identical.
}
}
+ template <class _CharT, class _Traits, class _Alloc>
+ void
+ basic_stringbuf<_CharT, _Traits, _Alloc>::
+ _M_pbump(char_type* __pbeg, char_type* __pend, off_type __off)
+ {
+ this->setp(__pbeg, __pend);
+ while (__off > __gnu_cxx::__numeric_traits<int>::__max)
+ {
+ this->pbump(__gnu_cxx::__numeric_traits<int>::__max);
+ __off -= __gnu_cxx::__numeric_traits<int>::__max;
+ }
+ this->pbump(__off);
+ }
+
// Inhibit implicit instantiations for required instantiations,
// which are defined via explicit instantiations elsewhere.
// NB: This syntax is a GNU extension.
// Stream buffer classes -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2009, 2010 Free Software Foundation, Inc.
+// 2006, 2007, 2008, 2009, 2010, 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
traits_type::copy(__s, this->gptr(), __len);
__ret += __len;
__s += __len;
- this->gbump(__len);
+ this->__safe_gbump(__len);
}
if (__ret < __n)
traits_type::copy(this->pptr(), __s, __len);
__ret += __len;
__s += __len;
- this->pbump(__len);
+ this->__safe_pbump(__len);
}
if (__ret < __n)
// Streambuf iterators
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007, 2009, 2010
+// 2006, 2007, 2009, 2010, 2011
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
if (__n > 1)
{
traits_type::copy(__result, __sb->gptr(), __n);
- __sb->gbump(__n);
+ __sb->__safe_gbump(__n);
__result += __n;
__c = __sb->underflow();
}
__n, __val);
if (__p)
__n = __p - __sb->gptr();
- __sb->gbump(__n);
+ __sb->__safe_gbump(__n);
__c = __sb->sgetc();
}
else
this->setg(this->pptr(), this->pptr(), this->pptr());
}
}
+
+ // Works around the issue with pbump, part of the protected
+ // interface of basic_streambuf, taking just an int.
+ void
+ _M_pbump(char_type* __pbeg, char_type* __pend, off_type __off);
};
}
#endif
+ // Also used by specializations for char and wchar_t in src.
+ void
+ __safe_gbump(streamsize __n) { _M_in_cur += __n; }
+
+ void
+ __safe_pbump(streamsize __n) { _M_out_cur += __n; }
+
private:
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// Side effect of DR 50.
streamsize(__n - _M_gcount));
if (__size > 1)
{
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
_M_gcount += __size;
__c = __sb->sgetc();
}
streamsize(__n - _M_gcount));
if (__size > 1)
{
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
_M_gcount += __size;
__c = __sb->sgetc();
}
__size = __p - __sb->gptr();
traits_type::copy(__s, __sb->gptr(), __size);
__s += __size;
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
_M_gcount += __size;
__c = __sb->sgetc();
}
__cdelim);
if (__p)
__size = __p - __sb->gptr();
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
_M_gcount += __size;
__c = __sb->sgetc();
}
- __sb->gptr());
__traits_type::copy(__s, __sb->gptr(), __size);
__s += __size;
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
__extracted += __size;
__c = __sb->sgetc();
}
__sb->gptr() + __size)
- __sb->gptr());
__str.append(__sb->gptr(), __size);
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
__extracted += __size;
__c = __sb->sgetc();
}
if (__p)
__size = __p - __sb->gptr();
__str.append(__sb->gptr(), __size);
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
__extracted += __size;
__c = __sb->sgetc();
}
__size = __p - __sb->gptr();
traits_type::copy(__s, __sb->gptr(), __size);
__s += __size;
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
_M_gcount += __size;
__c = __sb->sgetc();
}
__cdelim);
if (__p)
__size = __p - __sb->gptr();
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
_M_gcount += __size;
__c = __sb->sgetc();
}
if (__p)
__size = __p - __sb->gptr();
__str.append(__sb->gptr(), __size);
- __sb->gbump(__size);
+ __sb->__safe_gbump(__size);
__extracted += __size;
__c = __sb->sgetc();
}
// Stream buffer classes -*- C++ -*-
-// Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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
if (__n > 1)
{
const streamsize __wrote = __sbout->sputn(__sbin->gptr(), __n);
- __sbin->gbump(__wrote);
+ __sbin->__safe_gbump(__wrote);
__ret += __wrote;
if (__wrote < __n)
{
if (__n > 1)
{
const streamsize __wrote = __sbout->sputn(__sbin->gptr(), __n);
- __sbin->gbump(__wrote);
+ __sbin->__safe_gbump(__wrote);
__ret += __wrote;
if (__wrote < __n)
{
// strstream definitions -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005, 2009, 2010, 2011
+// Free Software Foundation
//
// 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
}
setp(buf, buf + new_size);
- pbump(old_size);
+ __safe_pbump(old_size);
if (reposition_get)
setg(buf, buf + old_get_offset, buf +
if (seeklow + off < pbase())
{
setp(seeklow, epptr());
- pbump(off);
+ __safe_pbump(off);
}
else
{
setp(pbase(), epptr());
- pbump(off - (pbase() - seeklow));
+ __safe_pbump(off - (pbase() - seeklow));
}
}
if (do_get)
projects / gcc.git / commitdiff