ensure imag datauri is released (#10118)

Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com>
mapbox · Nov 18, 2020 · 59c5425 · 59c5425
1 parent ee6136c
commit 59c5425
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/util/ajax.js b/src/util/ajax.js
@@ -280,6 +280,9 @@ function arrayBufferToImage(data: ArrayBuffer, callback: (err: ?Error, image: ?H
     img.onload = () => {
         callback(null, img);
         URL.revokeObjectURL(img.src);
+        // prevent image dataURI memory leak in Safari
+        img.onload = null;
+        img.src = transparentPngUrl;
     };
     img.onerror = () => callback(new Error('Could not load image. Please make sure to use a supported image type such as PNG or JPEG. Note that SVGs are not supported.'));
     const blob: Blob = new window.Blob([new Uint8Array(data)], {type: 'image/png'});

diff --git a/test/unit/util/ajax.test.js b/test/unit/util/ajax.test.js
@@ -110,7 +110,9 @@ test('ajax', (t) => {
         const jsdomImage = window.Image;
         window.Image = class {
             set src(src) {
-                setTimeout(() => this.onload());
+                setTimeout(() => {
+                    if (this.onload) this.onload();
+                });
             }
         };
 
@@ -200,7 +202,9 @@ test('ajax', (t) => {
         // jsdom doesn't call image onload; fake it https://github.com/jsdom/jsdom/issues/1816
         window.Image = class {
             set src(src) {
-                setTimeout(() => this.onload());
+                setTimeout(() => {
+                    if (this.onload) this.onload();
+                });
             }
         };