Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2540 from mduan/handle-broken-hex-string

Browse Source 
Handle broken hex string
This commit is contained in:
Brendan Dahl 2013-01-08 15:54:43 -08:00
commit e978ea2617
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/parser.js
View File

@ -460,28 +460,34 @@ var Lexer = (function LexerClosure() {
getHexString: function Lexer_getHexString(ch) {
var str = '';
var stream = this.stream;
for (;;) {
var isFirstHex = true;
var firstDigit;
var secondDigit;
while (true) {
ch = stream.getChar();
if (ch == '>') {
break;
}
if (!ch) {
warn('Unterminated hex string');
break;
}
if (specialChars[ch.charCodeAt(0)] != 1) {
var x, x2;
if ((x = toHexDigit(ch)) == -1)
error('Illegal character in hex string: ' + ch);
ch = stream.getChar();
while (specialChars[ch.charCodeAt(0)] == 1)
ch = stream.getChar();
if ((x2 = toHexDigit(ch)) == -1)
error('Illegal character in hex string: ' + ch);
str += String.fromCharCode((x << 4) | x2);
} else if (ch === '>') {
break;
} else if (specialChars[ch.charCodeAt(0)] === 1) {
continue;
} else {
if (isFirstHex) {
firstDigit = toHexDigit(ch);
if (firstDigit === -1) {
warn("Ignoring invalid character '" + ch + "' in hex string");
continue;
}
} else {
secondDigit = toHexDigit(ch);
if (secondDigit === -1) {
warn("Ignoring invalid character '" + ch + "' in hex string");
continue;
}
str += String.fromCharCode((firstDigit << 4) | secondDigit);
}
isFirstHex = !isFirstHex;
}
}
return str;

11
test/unit/parser_spec.js
View File

@ -12,6 +12,17 @@ describe('parser', function() {
expect(result).toEqual(11.234);
});
it('should not throw exception on bad input', function() {
// '8 0 2 15 5 2 2 2 4 3 2 4'
// should be parsed as
// '80 21 55 22 24 32'
var input = new StringStream('7 0 2 15 5 2 2 2 4 3 2 4>');
var lexer = new Lexer(input);
var result = lexer.getHexString('<');
expect(result).toEqual('p!U"$2');
});
});
});