hls.js 1.6.6-0.canary.11291 → 1.6.6-0.canary.11292

package/dist/hls.js

@@ -1165,7 +1165,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.6-0.canary.11291");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.6-0.canary.11292");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -2897,29 +2897,39 @@
     }
     var buffer = view.buffer;
     var systemId = Hex.hexDump(new Uint8Array(buffer, offset + 12, 16));
-    var dataSizeOrKidCount = view.getUint32(28);
     var kids = null;
     var data = null;
+    var dataSizeOffset = 0;
     if (version === 0) {
-      if (size - 32 < dataSizeOrKidCount || dataSizeOrKidCount < 22) {
-        return {
-          offset: offset,
-          size: size
-        };
-      }
-      data = new Uint8Array(buffer, offset + 32, dataSizeOrKidCount);
+      dataSizeOffset = 28;
     } else if (version === 1) {
-      if (!dataSizeOrKidCount || length < offset + 32 + dataSizeOrKidCount * 16 + 16) {
+      var kidCounts = view.getUint32(28);
+      if (!kidCounts || length < 32 + kidCounts * 16) {
         return {
           offset: offset,
           size: size
         };
       }
       kids = [];
-      for (var i = 0; i < dataSizeOrKidCount; i++) {
+      for (var i = 0; i < kidCounts; i++) {
         kids.push(new Uint8Array(buffer, offset + 32 + i * 16, 16));
       }
+      dataSizeOffset = 32 + kidCounts * 16;
+    }
+    if (!dataSizeOffset) {
+      return {
+        offset: offset,
+        size: size
+      };
+    }
+    var dataSizeOrKidCount = view.getUint32(dataSizeOffset);
+    if (size - 32 < dataSizeOrKidCount) {
+      return {
+        offset: offset,
+        size: size
+      };
     }
+    data = new Uint8Array(buffer, offset + dataSizeOffset + 4, dataSizeOrKidCount);
     return {
       version: version,
       systemId: systemId,
@@ -16680,7 +16690,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.6-0.canary.11291";
+  var version = "1.6.6-0.canary.11292";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js