Merge pull request #5999 from hellemar/handle-utf8-in-url
Bug 1122280 - Handle UTF-8 encoding in URI
This commit is contained in:
commit
67816bd085
@ -16,7 +16,8 @@
|
||||
*/
|
||||
/* globals PDFJS, Util, isDict, isName, stringToPDFString, warn, Dict, Stream,
|
||||
stringToBytes, assert, Promise, isArray, ObjectLoader, OperatorList,
|
||||
isValidUrl, OPS, createPromiseCapability, AnnotationType */
|
||||
isValidUrl, OPS, createPromiseCapability, AnnotationType,
|
||||
stringToUTF8String */
|
||||
|
||||
'use strict';
|
||||
|
||||
@ -500,7 +501,15 @@ var LinkAnnotation = (function LinkAnnotationClosure() {
|
||||
if (!isValidUrl(url, false)) {
|
||||
url = '';
|
||||
}
|
||||
data.url = url;
|
||||
// According to ISO 32000-1:2008, section 12.6.4.7,
|
||||
// URI should to be encoded in 7-bit ASCII.
|
||||
// Some bad PDFs may have URIs in UTF-8 encoding, see Bugzilla 1122280.
|
||||
try {
|
||||
data.url = stringToUTF8String(url);
|
||||
} catch (e) {
|
||||
// Fall back to a simple copy.
|
||||
data.url = url;
|
||||
}
|
||||
} else if (linkType === 'GoTo') {
|
||||
data.dest = action.get('D');
|
||||
} else if (linkType === 'GoToR') {
|
||||
|
Loading…
Reference in New Issue
Block a user