Fix crash when meta information is split across two subsequent http b…

…uffers.
fishpond-haiku · May 13, 2017 · ee7931d · ee7931d
1 parent 71f9192
commit ee7931d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ V_MAJOR = 0
 V_MIDDLE = 0
 V_MINOR = 3
 V_VARIETY = B_APPV_DEVELOPMENT
-V_BUILD = 12
+V_BUILD = 13
 
 TARGET_DIR := ./dist
 PACKAGE = $(TARGET_DIR)/$(NAME)_$(VERSION)-$(ARCH).hpkg

diff --git a/StreamIO.cpp b/StreamIO.cpp
@@ -199,7 +199,6 @@ StreamIO::DataWithMetaReceived(BUrlRequest* request, const char* data, off_t pos
 			if (fUntilMetaEnd <= size) {
 				memcpy(fMetaBuffer + fMetaSize, (void*)data, fUntilMetaEnd);
 				data += fUntilMetaEnd;
-				position += fUntilMetaEnd;
 				size -= fUntilMetaEnd;
 				fMetaSize += fUntilMetaEnd;
 				fMetaBuffer[fMetaSize] = 0;
@@ -214,9 +213,8 @@ StreamIO::DataWithMetaReceived(BUrlRequest* request, const char* data, off_t pos
 				memcpy(fMetaBuffer + fMetaSize, (void*)data, size);
 				fMetaSize += size;
 				data += size;
-				size = 0;
-				position += size;
 				fUntilMetaEnd -= size;
+				size = 0;
 			}
 		} else {
 			DataFunc nextFunc = fDataFuncs.Item(next);
@@ -235,15 +233,13 @@ StreamIO::DataWithMetaReceived(BUrlRequest* request, const char* data, off_t pos
 					fUntilMetaStart = fMetaInt;
 					TRACE("Meta: Empty\n");
 				} else if (fUntilMetaEnd > 512) {
+					TRACE("Meta: Size of %" B_PRIdOFF " too large\n", fUntilMetaEnd);
 					fUntilMetaStart = fMetaInt;
 					fUntilMetaEnd = 0;
-					TRACE("Meta: Size of " B_PRIdOFF " too large\n");
 					data--;
-					position--;
 					size++;
 				}
 				data++;
-				position++;
 				size--;
 			}
 		}