changes for v8 crash on http request delay (pxscene#1650)

madanagopalt · Michael Fiess · commit a519fba49677 · 2019-01-03T11:05:12.000-05:00
* changes for v8 crash on http request delay

* Update test_rtHttpRequest.cpp

* changes for v8 crash on http request delay

* Update test_rtHttpRequest.cpp

* Update test_rtHttpRequest.cpp

* Update test_rtHttpRequest.cpp

* Update test_rtHttpRequest.cpp

* added null check
diff --git a/examples/pxScene2d/src/v8_modules/console.js b/examples/pxScene2d/src/v8_modules/console.js
@@ -52,4 +52,6 @@ module.exports = {
     error: error,
     log: log,
     info: info,
+    time:info,
+    timeEnd: info,
 };
diff --git a/src/rtHttpRequest.cpp b/src/rtHttpRequest.cpp
@@ -133,11 +133,12 @@ rtError rtHttpRequest::end()
     return RT_FAIL;
   }
 
-  rtFileDownloadRequest* req = new rtFileDownloadRequest(mUrl.cString(), this, rtHttpRequest::onDownloadComplete);
+  rtFileDownloadRequest* req = new rtFileDownloadRequest(mUrl.cString(), this, rtHttpRequest::onDownloadCompleteAndRelease);
   req->setAdditionalHttpHeaders(mHeaders);
   req->setMethod(mMethod);
   req->setReadData(mWriteData, mWriteDataSize);
   if (rtFileDownloader::instance()->addToDownloadQueue(req)) {
+    AddRef();
     mInQueue = true;
     return RT_OK;
   }
@@ -278,6 +279,16 @@ void rtHttpRequest::onDownloadComplete(rtFileDownloadRequest* downloadRequest)
   }
 }
 
+void rtHttpRequest::onDownloadCompleteAndRelease(rtFileDownloadRequest* downloadRequest)
+{
+  onDownloadComplete(downloadRequest);
+  rtHttpRequest* req = (rtHttpRequest*)downloadRequest->callbackData();
+  if (req != NULL)
+  {
+    req->Release();
+  }
+}
+
 rtString rtHttpRequest::url() const
 {
   return mUrl;
diff --git a/src/rtHttpRequest.h b/src/rtHttpRequest.h
@@ -57,6 +57,7 @@ class rtHttpRequest : public rtObject
   rtError removeHeader(const rtString& name);
 
   static void onDownloadComplete(rtFileDownloadRequest* downloadRequest);
+  static void onDownloadCompleteAndRelease(rtFileDownloadRequest* downloadRequest);
 
   rtString url() const;
   std::vector<rtString> headers() const;

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,12 @@ rtError rtHttpRequest::end()`
`133`	`133`	`return RT_FAIL;`
`134`	`134`	`}`
`135`	`135`
`136`		`- rtFileDownloadRequest* req = new rtFileDownloadRequest(mUrl.cString(), this, rtHttpRequest::onDownloadComplete);`
	`136`	`+ rtFileDownloadRequest* req = new rtFileDownloadRequest(mUrl.cString(), this, rtHttpRequest::onDownloadCompleteAndRelease);`
`137`	`137`	`req->setAdditionalHttpHeaders(mHeaders);`
`138`	`138`	`req->setMethod(mMethod);`
`139`	`139`	`req->setReadData(mWriteData, mWriteDataSize);`
`140`	`140`	`if (rtFileDownloader::instance()->addToDownloadQueue(req)) {`
	`141`	`+ AddRef();`
`141`	`142`	`mInQueue = true;`
`142`	`143`	`return RT_OK;`
`143`	`144`	`}`
`@@ -278,6 +279,16 @@ void rtHttpRequest::onDownloadComplete(rtFileDownloadRequest* downloadRequest)`
`278`	`279`	`}`
`279`	`280`	`}`
`280`	`281`
	`282`	`+void rtHttpRequest::onDownloadCompleteAndRelease(rtFileDownloadRequest* downloadRequest)`
	`283`	`+{`
	`284`	`+ onDownloadComplete(downloadRequest);`
	`285`	`+ rtHttpRequest* req = (rtHttpRequest*)downloadRequest->callbackData();`
	`286`	`+ if (req != NULL)`
	`287`	`+ {`
	`288`	`+ req->Release();`
	`289`	`+ }`
	`290`	`+}`
	`291`	`+`
`281`	`292`	`rtString rtHttpRequest::url() const`
`282`	`293`	`{`
`283`	`294`	`return mUrl;`