Merge pull request #656 from notmasteryet/tree-32

Fixing invalid CFF DICT entry (#621)
2011-10-12 08:25:45 -07:00 · 2011-10-12 08:25:45 -07:00 · 4c07a362ea
commit 4c07a362ea
parent 924a6c52cb 07aa691fe0
1 changed files with 9 additions and 1 deletions
--- a/fonts.js
+++ b/fonts.js
@ -2861,7 +2861,15 @@ var Type2CFF = (function type2CFF() {
        if (b <= 21) {
          if (b === 12) {
            ++pos;
-            var b = (b << 8) | dict[pos];
+            var op = dict[pos];
+            if ((op > 14 && op < 17) ||
+                (op > 23 && op < 30) || op > 38) {
+              warn('Invalid CFF dictionary key: ' + op);
+              // trying to replace it with initialRandomSeed
+              // to pass sanitizer
+              dict[pos] = 19;
+            }
+            var b = (b << 8) | op;
          }
          entries.push([b, operands]);
          operands = [];