generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-19 07:47:09 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1941 from villytiger/streambuf-1.8.0

Browse Source 
Fix writing into closed socket from streambuf
This commit is contained in:
Günter Obiltschnig 2017-11-07 15:11:40 +01:00 committed by GitHub
commit 7e5984a76c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Foundation/include/Poco/BufferedBidirectionalStreamBuf.h
View File

@ -73,12 +73,12 @@ public:
{ {
if (!(_mode & IOS::out)) return char_traits::eof(); if (!(_mode & IOS::out)) return char_traits::eof();
if (flushBuffer() == std::streamsize(-1)) return char_traits::eof();
if (c != char_traits::eof()) if (c != char_traits::eof())
{ {
*this->pptr() = char_traits::to_char_type(c); *this->pptr() = char_traits::to_char_type(c);
this->pbump(1); this->pbump(1);
} }
if (flushBuffer() == std::streamsize(-1)) return char_traits::eof();
return c; return c;
} }
@ -127,7 +127,7 @@ protected:
void resetBuffers() void resetBuffers()
{ {
this->setg(_pReadBuffer + 4, _pReadBuffer + 4, _pReadBuffer + 4); this->setg(_pReadBuffer + 4, _pReadBuffer + 4, _pReadBuffer + 4);
this->setp(_pWriteBuffer, _pWriteBuffer + (_bufsize - 1)); this->setp(_pWriteBuffer, _pWriteBuffer + _bufsize);
} }
private: private:

4
Foundation/include/Poco/BufferedStreamBuf.h
View File

@ -60,7 +60,7 @@ public:
_mode(mode) _mode(mode)
{ {
this->setg(_pBuffer + 4, _pBuffer + 4, _pBuffer + 4); this->setg(_pBuffer + 4, _pBuffer + 4, _pBuffer + 4);
this->setp(_pBuffer, _pBuffer + (_bufsize - 1)); this->setp(_pBuffer, _pBuffer + _bufsize);
} }
~BasicBufferedStreamBuf() ~BasicBufferedStreamBuf()
@ -72,12 +72,12 @@ public:
{ {
if (!(_mode & IOS::out)) return char_traits::eof(); if (!(_mode & IOS::out)) return char_traits::eof();
if (flushBuffer() == std::streamsize(-1)) return char_traits::eof();
if (c != char_traits::eof()) if (c != char_traits::eof())
{ {
*this->pptr() = char_traits::to_char_type(c); *this->pptr() = char_traits::to_char_type(c);
this->pbump(1); this->pbump(1);
} }
if (flushBuffer() == std::streamsize(-1)) return char_traits::eof();
return c; return c;
} }