summaryrefslogtreecommitdiff
path: root/lib/string_decoder.js
diff options
context:
space:
mode:
Diffstat (limited to 'lib/string_decoder.js')
-rw-r--r--lib/string_decoder.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/string_decoder.js b/lib/string_decoder.js
index 04d31b2607..18097be0e6 100644
--- a/lib/string_decoder.js
+++ b/lib/string_decoder.js
@@ -43,10 +43,12 @@ const kNativeDecoder = Symbol('kNativeDecoder');
// modules monkey-patch it to support additional encodings
function normalizeEncoding(enc) {
const nenc = internalUtil.normalizeEncoding(enc);
- if (typeof nenc !== 'string' &&
- (Buffer.isEncoding === isEncoding || !Buffer.isEncoding(enc)))
- throw new errors.TypeError('ERR_UNKNOWN_ENCODING', enc);
- return nenc || enc;
+ if (nenc === undefined) {
+ if (Buffer.isEncoding === isEncoding || !Buffer.isEncoding(enc))
+ throw new errors.TypeError('ERR_UNKNOWN_ENCODING', enc);
+ return enc;
+ }
+ return nenc;
}
const encodingsMap = {};