commit 325c78d1d25eeb9c2a3fbb5e2bb2e89af7d01a30 parent 2d475522adb2170010c5c57650eee8b48149ab64 Author: Simon Kornblith <simon@simonster.com> Date: Thu, 5 Jul 2012 16:49:21 -0700 Merge pull request #142 from sss/handle-malformed-uri-sequence-in-getFileNameFromURL Use hex-encoded MD5 of fileBaseName if it is in malformed URI sequence. Diffstat:
| M | chrome/content/zotero/xpcom/attachments.js | | | 18 | +++++++++++++++++- |
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js @@ -1164,8 +1164,24 @@ Zotero.Attachments = new function(){ nsIURL.fileBaseName = nsIURL.fileBaseName + '.' + tld; } + // Unencode fileBaseName + var decodedFileBaseName; + try { + decodedFileBaseName = decodeURIComponent(nsIURL.fileBaseName); + } + catch (e) { + if (e.name == 'URIError') { + // If we got a 'malformed URI sequence' while decoding, + // try MD5 (in hex string) of fileBaseName. + decodedFileBaseName = Zotero.Utilities.Internal.md5(nsIURL.fileBaseName, false); + } + else { + throw e; + } + } + // Pass unencoded name to getValidFileName() so that '%20' isn't stripped to '20' - nsIURL.fileBaseName = Zotero.File.getValidFileName(decodeURIComponent(nsIURL.fileBaseName)); + nsIURL.fileBaseName = Zotero.File.getValidFileName(decodedFileBaseName); return decodeURIComponent(nsIURL.fileName); }