Merge pull request #1011 from glennguy/backport-padding-fix

[Backport] Don't do PKCS7 stripping on chunked transfers
xbmc · Jun 23, 2022 · 6c54634 · 6c54634
2 parents 1c0d657 + eebfad4
commit 6c54634
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main.cpp b/src/main.cpp
@@ -349,7 +349,12 @@ bool KodiAdaptiveStream::download(const char* url,
       // read the file
       char* buf = (char*)malloc(32 * 1024);
       size_t nbReadOverall = 0;
-      while ((nbRead = file.Read(buf, 32 * 1024)) > 0 && ~nbRead && write_data(buf, nbRead, file.AtEnd()))
+      std::string transferEncodingStr{
+          file.GetPropertyValue(ADDON_FILE_PROPERTY_RESPONSE_HEADER, "Transfer-Encoding")};
+      bool isChunked{transferEncodingStr.find("hunked") != std::string::npos};
+
+      while ((nbRead = file.Read(buf, 32 * 1024)) > 0 && ~nbRead &&
+             write_data(buf, nbRead, (!isChunked && file.AtEnd())))
         nbReadOverall += nbRead;
       free(buf);