suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inconsequential bug in Zotero.MIME.sniffForMIMEType()

Browse Source 
`undefined` was being passed as an argument to slice(), but 0 is the
only offset that's used anyway, and that's what happens if you pass
`undefined`.
This commit is contained in:
Dan Stillman 2018-05-05 00:09:35 -04:00
parent 7271fdf6b7
commit 9220b2d9c2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chrome/content/zotero/xpcom/mime.js
View File

@ -26,7 +26,6 @@
Zotero.MIME = new function(){ Zotero.MIME = new function(){
this.isTextType = isTextType; this.isTextType = isTextType;
this.getPrimaryExtension = getPrimaryExtension; this.getPrimaryExtension = getPrimaryExtension;
this.sniffForMIMEType = sniffForMIMEType;
this.sniffForBinary = sniffForBinary; this.sniffForBinary = sniffForBinary;
this.hasNativeHandler = hasNativeHandler; this.hasNativeHandler = hasNativeHandler;
this.hasInternalHandler = hasInternalHandler; this.hasInternalHandler = hasInternalHandler;
@ -228,12 +227,12 @@ Zotero.MIME = new function(){
/* /*
* Searches string for magic numbers * Searches string for magic numbers
*/ */
function sniffForMIMEType(str){ this.sniffForMIMEType = function (str) {
for (var i in _snifferEntries){ for (let i in _snifferEntries) {
var match = false; let match = false;
// If an offset is defined, match only from there // If an offset is defined, match only from there
if (typeof _snifferEntries[i][2] != 'undefined') { if (_snifferEntries[i][2] != undefined) {
if (str.substr(i[2]).indexOf(_snifferEntries[i][0]) == 0) { if (str.substr(_snifferEntries[i][2]).indexOf(_snifferEntries[i][0]) == 0) {
match = true; match = true;
} }
} }
@ -274,7 +273,7 @@ Zotero.MIME = new function(){
* ext is an optional file extension hint if data sniffing is unsuccessful * ext is an optional file extension hint if data sniffing is unsuccessful
*/ */
this.getMIMETypeFromData = function (str, ext){ this.getMIMETypeFromData = function (str, ext){
var mimeType = sniffForMIMEType(str); var mimeType = this.sniffForMIMEType(str);
if (mimeType){ if (mimeType){
Zotero.debug('Detected MIME type ' + mimeType); Zotero.debug('Detected MIME type ' + mimeType);
return mimeType; return mimeType;