i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix thread safety issue in chunked http transfers.

Browse Source 
* The use of a static variable for storing the chunk size made it shared between all instances of BUrlProtoclHttp.
* Inline the function at the single place where it is used, and allocate the variable on the stack instead.

The whole receiving loop should be split into chunked and non-chunked variants to improve code readability.
This commit is contained in:
Adrien Destugues
2013-08-27 20:36:29 +02:00
parent 7032e70330
commit 2ec188b903
2 changed files with 44 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/net/UrlProtocolHttp.h
-3
View File
@@ -54,9 +54,6 @@ private:
void _ParseStatus();
void _ParseHeaders();
void _CopyChunkInBuffer(char** buffer,
ssize_t* bytesReceived);
void _AddOutputBufferLine(const char* line);
src/kits/network/libnetapi/UrlProtocolHttp.cpp
+44 -52
View File
@@ -466,6 +466,7 @@ BUrlProtocolHttp::_MakeRequest()
ssize_t bytesReceived = 0;
ssize_t bytesTotal = 0;
char* inputTempBuffer = NULL;
ssize_t chunkSize = -1;
fQuit = false;
while (!fQuit && !(receiveEnd && parseEnd)) {
@@ -524,14 +525,53 @@ BUrlProtocolHttp::_MakeRequest()
// If Transfer-Encoding is chunked, we should read a complete
// chunk in buffer before handling it
if (readByChunks) {
_CopyChunkInBuffer(&inputTempBuffer, &bytesRead);
if (chunkSize >= 0) {
if ((ssize_t)fInputBuffer.Size() >= chunkSize + 2) {
// 2 more bytes to handle the closing CR+LF
bytesRead = chunkSize;
inputTempBuffer = new char[chunkSize+2];
fInputBuffer.RemoveData(inputTempBuffer, chunkSize+2);
chunkSize = -1;
} else {
// Not enough data, try again later
bytesRead = -1;
inputTempBuffer = NULL;
}
} else {
BString chunkHeader;
if (_GetLine(chunkHeader) == B_ERROR) {
chunkSize = -1;
inputTempBuffer = NULL;
bytesRead = -1;
} else {
// Format of a chunk header:
// <chunk size in hex>[; optional data]
int32 semiColonIndex = chunkHeader.FindFirst(";", 0);
// A chunk of 0 bytes indicates the end of the chunked transfer
// Cut-off optional data if present
if (semiColonIndex != -1) {
chunkHeader.Remove(semiColonIndex,
chunkHeader.Length() - semiColonIndex);
}
chunkSize = strtol(chunkHeader.String(), NULL, 16);
PRINT(("BHP[%p] Chunk %s=%ld\n", this,
chunkHeader.String(), chunkSize));
if (chunkSize == 0) {
fContentReceived = true;
}
bytesRead = -1;
inputTempBuffer = NULL;
}
}
// A chunk of 0 bytes indicates the end of the chunked
// transfer
if (bytesRead == 0) {
receiveEnd = true;
}
}
else {
} else {
bytesRead = fInputBuffer.Size();
if (bytesRead > 0) {
@@ -542,8 +582,6 @@ BUrlProtocolHttp::_MakeRequest()
if (bytesRead > 0) {
bytesReceived += bytesRead;
_EmitDebug(B_URL_PROTOCOL_DEBUG_TRANSFER_IN, "%d bytes",
bytesRead);
if (fListener != NULL) {
fListener->DataReceived(this, inputTempBuffer, bytesRead);
@@ -654,52 +692,6 @@ BUrlProtocolHttp::_ParseHeaders()
}
void
BUrlProtocolHttp::_CopyChunkInBuffer(char** buffer, ssize_t* bytesReceived)
{
static ssize_t chunkSize = -1;
BString chunkHeader;
if (chunkSize >= 0) {
if ((ssize_t)fInputBuffer.Size() >= chunkSize + 2) {
// 2 more bytes to handle the closing CR+LF
*bytesReceived = chunkSize;
*buffer = new char[chunkSize+2];
fInputBuffer.RemoveData(*buffer, chunkSize+2);
chunkSize = -1;
} else {
*bytesReceived = -1;
*buffer = NULL;
}
} else {
if (_GetLine(chunkHeader) == B_ERROR) {
chunkSize = -1;
*buffer = NULL;
*bytesReceived = -1;
return;
}
// Format of a chunk header:
// <chunk size in hex>[; optional data]
int32 semiColonIndex = chunkHeader.FindFirst(";", 0);
// Cut-off optional data if present
if (semiColonIndex != -1)
chunkHeader.Remove(semiColonIndex,
chunkHeader.Length() - semiColonIndex);
chunkSize = strtol(chunkHeader.String(), NULL, 16);
PRINT(("BHP[%p] Chunk %s=%ld\n", this, chunkHeader.String(), chunkSize));
if (chunkSize == 0) {
fContentReceived = true;
}
*bytesReceived = -1;
*buffer = NULL;
}
}
void
BUrlProtocolHttp::_CreateRequest()
{