fix crash when unknown extension given

fixes #6
jshttp · Jun 20, 2014 · fb6c4c1 · fb6c4c1
1 parent 837d900
commit fb6c4c1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/History.md b/History.md
@@ -1,3 +1,13 @@
+unreleased
+==========
+
+ * fix crash when unknown extension given
+
+1.0.4 / 2014-06-19
+==================
+
+  * use `mime-types`
+
 1.0.3 / 2014-06-11
 ==================
 

diff --git a/index.js b/index.js
@@ -60,7 +60,7 @@ Accepts.prototype.types = function (types) {
   var n = this.negotiator;
   if (!types.length) return n.mediaTypes();
   if (!this.headers.accept) return types[0];
-  var mimes = types.map(extToMime);
+  var mimes = types.map(extToMime).filter(validMime);
   var accepts = n.mediaTypes(mimes);
   var first = accepts[0];
   if (!first) return false;
@@ -146,3 +146,15 @@ function extToMime(type) {
   if (~type.indexOf('/')) return type;
   return mime.lookup(type);
 }
+
+/**
+ * Check if mime is valid.
+ *
+ * @param {String} type
+ * @return {String}
+ * @api private
+ */
+
+function validMime(type) {
+  return typeof type === 'string';
+}
diff --git a/test/type.js b/test/type.js
@@ -55,6 +55,7 @@ describe('accepts.types()', function(){
       accept.types('txt').should.equal('txt');
       accept.types('.txt').should.equal('.txt');
       accept.types('png').should.be.false;
+      accept.types('bogus').should.be.false;
     })
   })