fix(curl): fix hls play crash

Signed-off-by: pingkai <pingkai010@gmail.com>
alibaba · Feb 24, 2020 · 5271362 · 5271362
1 parent 0b2496a
commit 5271362
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/framework/data_source/curl/CURLConnection.cpp b/framework/data_source/curl/CURLConnection.cpp
@@ -687,19 +687,18 @@ int CURLConnection::readBuffer(void *buf, size_t size)
     /*if (re == CURLE_OK)
         av_log(mCurlhttpContext.hd,AV_LOG_DEBUG,"download speed is %f\n",downloadSpeed);*/
     uint32_t want = std::min(RingBuffergetMaxReadSize(pRbuf), (uint32_t) size);
-    assert(want > 0);
 
-    if (RingBufferReadData(pRbuf, (char *) buf, want) == want) {
+    if (want > 0 && RingBufferReadData(pRbuf, (char *) buf, want) == want) {
         mFilePos += want;
         return want;
     }
 
     /* check if we finished prematurely */
     if (!still_running &&
-            (mFileSize <= 0 || mFilePos != mFileSize)) {
+            (mFileSize > 0 && mFilePos != mFileSize)) {
         AF_LOGE("%s - Transfer ended before entire file was retrieved pos %lld, size %lld",
                 __FUNCTION__, mFilePos, mFileSize);
-        return -1;
+        //   return -1;
     }
 
     return 0;

diff --git a/framework/data_source/curl/curl_data_source.cpp b/framework/data_source/curl/curl_data_source.cpp
@@ -233,7 +233,6 @@ void CurlDataSource::closeConnections(bool current)
     lock_guard<mutex> lock(mMutex);
     CURLConnection *deleteConnection = nullptr;
     vector<CURLConnection *> *pConnections = mConnections;
-    mPConnection = nullptr;
     mConnections = nullptr;
 
     if (current) {