mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #9045 from brendandahl/sani-name

Browse source 
Sanitize name index in compile phase of CFF.
This commit is contained in:
Jonas Jenwald 2017-10-24 11:48:03 +02:00 • committed by GitHub
commit d71a576b30
5 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/core/cff_parser.js
View file

@ -413,26 +413,7 @@ var CFFParser = (function CFFParserClosure() {
var names = [];
for (var i = 0, ii = index.count; i < ii; ++i) {
var name = index.get(i);
// OTS doesn't allow names to be over 127 characters.
var length = Math.min(name.length, 127);
var data = [];
// OTS also only permits certain characters in the name.
for (var j = 0; j < length; ++j) {
var c = name[j];
if (j === 0 && c === 0) {
data[j] = c;
continue;
}
if ((c < 33 || c > 126) || c === 91 /* [ */ || c === 93 /* ] */ ||
c === 40 /* ( */ || c === 41 /* ) */ || c === 123 /* { */ ||
c === 125 /* } */ || c === 60 /* < */ || c === 62 /* > */ ||
c === 47 /* / */ || c === 37 /* % */ || c === 35 /* # */) {
data[j] = 95;
continue;
}
data[j] = c;
}
names.push(bytesToString(data));
names.push(bytesToString(name));
}
return names;
},
@ -1413,7 +1394,27 @@ var CFFCompiler = (function CFFCompilerClosure() {
compileNameIndex: function CFFCompiler_compileNameIndex(names) {
var nameIndex = new CFFIndex();
for (var i = 0, ii = names.length; i < ii; ++i) {
nameIndex.add(stringToBytes(names[i]));
var name = names[i];
// OTS doesn't allow names to be over 127 characters.
var length = Math.min(name.length, 127);
var sanitizedName = new Array(length);
for (var j = 0; j < length; j++) {
// OTS requires chars to be between a range and not certain other
// chars.
var char = name[j];
if (char < '!' || char > '~' || char === '[' || char === ']' ||
char === '(' || char === ')' || char === '{' || char === '}' ||
char === '<' || char === '>' || char === '/' || char === '%') {
char = '_';
}
sanitizedName[j] = char;
}
sanitizedName = sanitizedName.join('');
if (sanitizedName === '') {
sanitizedName = 'Bad_Font_Name';
}
nameIndex.add(stringToBytes(sanitizedName));
}
return this.compileIndex(nameIndex);
},