fabric 6.8.0 → 6.9.0

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [next]
 
+## [6.9.0]
+
+- fix(): Prototype pollution risk on text char cache [#10782](https://github.com/fabricjs/fabric.js/pull/10782)
+
 ## [6.8.0]
 
 - fix(): CWE-1333 CWE-400 CWE-730 Simplify some regexes in order to avoid slowness with craft bad string #10746

package/dist/index.js

@@ -337,11 +337,11 @@
   };
 
   class Cache {
+    /**
+     * Cache of widths of chars in text rendering.
+     */
+
     constructor() {
-      /**
-       * Cache of widths of chars in text rendering.
-       */
-      _defineProperty(this, "charWidthsCache", {});
       /**
        * This object keeps the results of the boundsOfCurve calculation mapped by the joined arguments necessary to calculate it.
        * It does speed up calculation, if you parse and add always the same paths, but in case of heavy usage of freedrawing
@@ -351,7 +351,9 @@
        * It was an internal variable, is accessible since version 2.3.4
        */
       _defineProperty(this, "boundsOfCurveCache", {});
+      this.charWidthsCache = new Map();
     }
+
     /**
      * @return {Object} reference to cache
      */
@@ -362,15 +364,16 @@
         fontWeight
       } = _ref;
       fontFamily = fontFamily.toLowerCase();
-      if (!this.charWidthsCache[fontFamily]) {
-        this.charWidthsCache[fontFamily] = {};
+      const cache = this.charWidthsCache;
+      if (!cache.has(fontFamily)) {
+        cache.set(fontFamily, new Map());
       }
-      const fontCache = this.charWidthsCache[fontFamily];
+      const fontCache = cache.get(fontFamily);
       const cacheKey = "".concat(fontStyle.toLowerCase(), "_").concat((fontWeight + '').toLowerCase());
-      if (!fontCache[cacheKey]) {
-        fontCache[cacheKey] = {};
+      if (!fontCache.has(cacheKey)) {
+        fontCache.set(cacheKey, new Map());
       }
-      return fontCache[cacheKey];
+      return fontCache.get(cacheKey);
     }
 
     /**
@@ -385,11 +388,10 @@
      * @param {String} [fontFamily] font family to clear
      */
     clearFontCache(fontFamily) {
-      fontFamily = (fontFamily || '').toLowerCase();
       if (!fontFamily) {
-        this.charWidthsCache = {};
-      } else if (this.charWidthsCache[fontFamily]) {
-        delete this.charWidthsCache[fontFamily];
+        this.charWidthsCache = new Map();
+      } else {
+        this.charWidthsCache.delete((fontFamily || '').toLowerCase());
       }
     }
 
@@ -411,7 +413,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.8.0";
+  var version = "6.9.0";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -19379,14 +19381,14 @@
         stylesAreEqual = previousChar && fontDeclaration === this._getFontDeclaration(prevCharStyle),
         fontMultiplier = charStyle.fontSize / this.CACHE_FONT_SIZE;
       let width, coupleWidth, previousWidth, kernedWidth;
-      if (previousChar && fontCache[previousChar] !== undefined) {
-        previousWidth = fontCache[previousChar];
+      if (previousChar && fontCache.has(previousChar)) {
+        previousWidth = fontCache.get(previousChar);
       }
-      if (fontCache[_char] !== undefined) {
-        kernedWidth = width = fontCache[_char];
+      if (fontCache.has(_char)) {
+        kernedWidth = width = fontCache.get(_char);
       }
-      if (stylesAreEqual && fontCache[couple] !== undefined) {
-        coupleWidth = fontCache[couple];
+      if (stylesAreEqual && fontCache.has(couple)) {
+        coupleWidth = fontCache.get(couple);
         kernedWidth = coupleWidth - previousWidth;
       }
       if (width === undefined || previousWidth === undefined || coupleWidth === undefined) {
@@ -19395,16 +19397,16 @@
         this._setTextStyles(ctx, charStyle, true);
         if (width === undefined) {
           kernedWidth = width = ctx.measureText(_char).width;
-          fontCache[_char] = width;
+          fontCache.set(_char, width);
         }
         if (previousWidth === undefined && stylesAreEqual && previousChar) {
           previousWidth = ctx.measureText(previousChar).width;
-          fontCache[previousChar] = previousWidth;
+          fontCache.set(previousChar, previousWidth);
         }
         if (stylesAreEqual && coupleWidth === undefined) {
           // we can measure the kerning couple and subtract the width of the previous character
           coupleWidth = ctx.measureText(couple).width;
-          fontCache[couple] = coupleWidth;
+          fontCache.set(couple, coupleWidth);
           // safe to use the non-null since if undefined we defined it before.
           kernedWidth = coupleWidth - previousWidth;
         }