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

Prevent errors, because of incorrect scope, in the XMLParserBase._resolveEntities method (issue 10407)

Browse Source
This commit is contained in:
Jonas Jenwald 2019-01-03 21:41:52 +01:00
parent 5a2bd9fc63
commit 6cd9ff48f3
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/display/xml_parser.js
View File

@ -46,7 +46,7 @@ function isWhitespaceString(s) {
class XMLParserBase { class XMLParserBase {
_resolveEntities(s) { _resolveEntities(s) {
return s.replace(/&([^;]+);/g, function (all, entity) { return s.replace(/&([^;]+);/g, (all, entity) => {
if (entity.substring(0, 2) === '#x') { if (entity.substring(0, 2) === '#x') {
return String.fromCharCode(parseInt(entity.substring(2), 16)); return String.fromCharCode(parseInt(entity.substring(2), 16));
} else if (entity.substring(0, 1) === '#') { } else if (entity.substring(0, 1) === '#') {

19
test/unit/metadata_spec.js
View File

@ -127,4 +127,23 @@ describe('metadata', function() {
expect(isEmptyObj(metadata.getAll())).toEqual(true); expect(isEmptyObj(metadata.getAll())).toEqual(true);
}); });
it('should correctly handle metadata containing "&apos" (issue 10407)',
function() {
const data = '<x:xmpmeta xmlns:x=\'adobe:ns:meta/\'>' +
'<rdf:RDF xmlns:rdf=\'http://www.w3.org/1999/02/22-rdf-syntax-ns#\'>' +
'<rdf:Description xmlns:dc=\'http://purl.org/dc/elements/1.1/\'>' +
'<dc:title><rdf:Alt>' +
'<rdf:li xml:lang="x-default">&apos;Foo bar baz&apos;</rdf:li>' +
'</rdf:Alt></dc:title></rdf:Description></rdf:RDF></x:xmpmeta>';
const metadata = new Metadata(data);
expect(metadata.has('dc:title')).toBeTruthy();
expect(metadata.has('dc:qux')).toBeFalsy();
expect(metadata.get('dc:title')).toEqual('\'Foo bar baz\'');
expect(metadata.get('dc:qux')).toEqual(null);
expect(metadata.getAll()).toEqual({ 'dc:title': '\'Foo bar baz\'', });
});
}); });