net/Socket.hpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 732f67e2204822fc6efb05bbd1ea028fe953c967
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Sat Mar 30 11:30:39 2019 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Mar 30 18:29:26 2019 +0100
Crop socket buffer removal to socket buffer size & warn.
Change-Id: I734b4682941d71eee02a25aab61c8e4353a11718
Reviewed-on: https://gerrit.libreoffice.org/69951
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 531f5358a..2f0217d76 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -932,7 +932,11 @@ public:
/// Remove the first @count bytes from input buffer
void eraseFirstInputBytes(size_t count)
{
- _inBuffer.erase(_inBuffer.begin(), _inBuffer.begin() + count);
+ size_t toErase = std::min(count, _inBuffer.size());
+ if (toErase < count)
+ LOG_ERR("#" << getFD() << ": attempted to remove: " << count << "
which is > size: " << _inBuffer.size() << " clamped to " << toErase);
+ if (toErase > 0)
+ _inBuffer.erase(_inBuffer.begin(), _inBuffer.begin() + count);
}
/// Detects if we have an HTTP header in the provided message and
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
