[libcxx] Fix a bug in strstreambuf::overflow.

The end pointer should point to one past the end of the newly allocated
buffer.

rdar://problem/24265174

Differential Revision: http://reviews.llvm.org/D20334


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@274132 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Akira Hatanaka
2016-06-29 15:26:13 +00:00
parent 05d5c05fe8
commit 70bf1c2280
2 changed files with 33 additions and 2 deletions

View File

@@ -175,7 +175,6 @@ strstreambuf::overflow(int_type __c)
ptrdiff_t ninp = gptr() - eback(); ptrdiff_t ninp = gptr() - eback();
ptrdiff_t einp = egptr() - eback(); ptrdiff_t einp = egptr() - eback();
ptrdiff_t nout = pptr() - pbase(); ptrdiff_t nout = pptr() - pbase();
ptrdiff_t eout = epptr() - pbase();
if (__strmode_ & __allocated) if (__strmode_ & __allocated)
{ {
if (__pfree_) if (__pfree_)
@@ -184,7 +183,7 @@ strstreambuf::overflow(int_type __c)
delete [] eback(); delete [] eback();
} }
setg(buf, buf + ninp, buf + einp); setg(buf, buf + ninp, buf + einp);
setp(buf + einp, buf + einp + eout); setp(buf + einp, buf + new_size);
pbump(static_cast<int>(nout)); pbump(static_cast<int>(nout));
__strmode_ |= __allocated; __strmode_ |= __allocated;
} }

View File

@@ -0,0 +1,32 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <strstream>
// class strstreambuf
// int overflow(int c);
#include <iostream>
#include <string>
#include <strstream>
int main(int, char const **argv) {
std::ostrstream oss;
std::string s;
for (int i = 0; i < 4096; ++i)
s.push_back((i % 16) + 'a');
oss << s << std::ends;
std::cout << oss.str();
oss.freeze(false);
return 0;
}