[Loader] loadBytes was broken because of too narrow bytes_buf scope

lightspark · Feb 28, 2013 · ea02656 · ea02656
1 parent 6b32205
commit ea02656
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/scripting/flash/display/flashdisplay.cpp b/src/scripting/flash/display/flashdisplay.cpp
@@ -317,21 +317,28 @@ void LoaderThread::execute()
 		loaderInfo->setBytesTotal(bytes->getLength());
 		loaderInfo->setBytesLoaded(bytes->getLength());
 
-		bytes_buf bb(bytes->bytes,bytes->getLength());
+		sbuf = new bytes_buf(bytes->bytes,bytes->getLength());
-		sbuf=&bb;
 	}
 
 	istream s(sbuf);
 	ParseThread local_pt(s,loaderInfo->applicationDomain,loaderInfo->securityDomain,loader.getPtr(),url.getParsedURL());
 	local_pt.execute();
 
-	{
+	// Delete the bytes container (downloader or bytes_buf)
+	if (source==URL) {
 		//Acquire the lock to ensure consistency in threadAbort
 		SpinlockLocker l(downloaderLock);
 		if(downloader)
 			getSys()->downloadManager->destroy(downloader);
 		downloader=NULL;
+		sbuf = NULL;
+	}
+	else if (source==BYTES)
+	{
+		delete sbuf;
+		sbuf = NULL;
 	}
+
 	bytes.reset();
 
 	_NR<DisplayObject> obj=local_pt.getParsedObject();