perf: prevent internal throw when missing charset

closes #250
expressjs · Aug 5, 2017 · 9437df9 · 9437df9
1 parent fb5b8ec
commit 9437df9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -15,6 +15,7 @@ unreleased
     - Use `http-errors` for standard emitted errors
     - deps: bytes@2.5.0
     - deps: iconv-lite@0.4.18
+  * perf: prevent internal `throw` when missing charset
 
 1.17.2 / 2017-05-17
 ===================

diff --git a/lib/types/json.js b/lib/types/json.js
@@ -154,7 +154,7 @@ function firstchar (str) {
 
 function getCharset (req) {
   try {
-    return contentType.parse(req).parameters.charset.toLowerCase()
+    return (contentType.parse(req).parameters.charset || '').toLowerCase()
   } catch (e) {
     return undefined
   }

diff --git a/lib/types/text.js b/lib/types/text.js
@@ -101,7 +101,7 @@ function text (options) {
 
 function getCharset (req) {
   try {
-    return contentType.parse(req).parameters.charset.toLowerCase()
+    return (contentType.parse(req).parameters.charset || '').toLowerCase()
   } catch (e) {
     return undefined
   }

diff --git a/lib/types/urlencoded.js b/lib/types/urlencoded.js
@@ -171,7 +171,7 @@ function extendedparser (options) {
 
 function getCharset (req) {
   try {
-    return contentType.parse(req).parameters.charset.toLowerCase()
+    return (contentType.parse(req).parameters.charset || '').toLowerCase()
   } catch (e) {
     return undefined
   }