remove iv leak

videojs · Mar 28, 2019 · 13a749a · 13a749a
1 parent 57fe74c
commit 13a749a
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/src/segment-loader.js b/src/segment-loader.js
@@ -372,23 +372,31 @@ export default class SegmentLoader extends videojs.EventTarget {
    * @return {Object}
    *         Key object for desired key
    */
-   segmentKey(key, set = false) {
-     if (!key) {
-       return null;
-     }
-
-     const id = segmentKeyId(key);
-     let storedKey = this.keyCache_[id];
-
-     if (this.cacheEncryptionKeys_ && set && !storedKey && key.bytes) {
-       this.keyCache_[id] = storedKey = {
-         resolvedUri: key.resolvedUri,
-         bytes: key.bytes
-       };
-     }
-
-     return storedKey || { resolvedUri: key.resolvedUri };
-   }
+  segmentKey(key, set = false) {
+    if (!key) {
+      return null;
+    }
+
+    const id = segmentKeyId(key);
+    let storedKey = this.keyCache_[id];
+
+    if (this.cacheEncryptionKeys_ && set && !storedKey && key.bytes) {
+      this.keyCache_[id] = storedKey = {
+        resolvedUri: key.resolvedUri,
+        bytes: key.bytes
+      };
+    }
+
+    const result = {
+      resolvedUri: (storedKey || key).resolvedUri
+    };
+
+    if (storedKey) {
+      result.bytes = storedKey.bytes;
+    }
+
+    return result;
+  }
 
   /**
    * Returns true if all configuration required for loading is present, otherwise false.