nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for weird string ctor behaviour

Browse Source
This commit is contained in:
John
2021-11-13 10:43:56 +01:00
parent a8051015a8
commit 193bd9ae64
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utils/httpclient.cpp
+6 -2
View File
@@ -234,7 +234,7 @@ bool HttpClient::request(const string& method, const string& uri, const string&
size_t HttpClient::readUntil(const string& delim, const size_t length, string* result) { size_t HttpClient::readUntil(const string& delim, const size_t length, string* result) {
if (!m_buffer) { if (!m_buffer) {
m_buffer = reinterpret_cast<char*>(malloc(1024)); m_buffer = reinterpret_cast<char*>(malloc(1024+1)); // 1 extra for final terminator
if (!m_buffer) { if (!m_buffer) {
return string::npos; return string::npos;
} }
@@ -250,8 +250,12 @@ size_t HttpClient::readUntil(const string& delim, const size_t length, string* r
if (received == 0) { if (received == 0) {
break; break;
} }
if (static_cast<unsigned>(received) > m_bufferSize) {
return string::npos; // error in recv
}
m_buffer[received] = 0;
size_t oldLength = result->length(); size_t oldLength = result->length();
*result += string(m_buffer, 0, static_cast<unsigned>(received)); *result += m_buffer;
if (findDelim) { if (findDelim) {
pos = result->find(delim, oldLength - (delim.length() - 1)); pos = result->find(delim, oldLength - (delim.length() - 1));
} }