summaryrefslogtreecommitdiff
path: root/lib/string_decoder.js
diff options
context:
space:
mode:
authorBrian White <mscdex@mscdex.net>2015-04-28 10:53:06 -0400
committerBrian White <mscdex@mscdex.net>2015-04-28 11:13:39 -0400
commit0fa6c4a6fc7ed4a2dfe821f1d3a46d5f6ff43e69 (patch)
tree75e85acb6eed9937786d4ec413f9a191f0306bd1 /lib/string_decoder.js
parente55fdc47a7420e81ca0ddec5449839b43382bea3 (diff)
downloadandroid-node-v8-0fa6c4a6fc7ed4a2dfe821f1d3a46d5f6ff43e69.tar.gz
android-node-v8-0fa6c4a6fc7ed4a2dfe821f1d3a46d5f6ff43e69.tar.bz2
android-node-v8-0fa6c4a6fc7ed4a2dfe821f1d3a46d5f6ff43e69.zip
string_decoder: don't cache Buffer.isEncoding
Some modules are monkey-patching Buffer.isEncoding, so without this they cannot do that. Fixes: https://github.com/iojs/io.js/issues/1547 PR-URL: https://github.com/iojs/io.js/pull/1548 Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'lib/string_decoder.js')
-rw-r--r--lib/string_decoder.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/string_decoder.js b/lib/string_decoder.js
index 61a3bb20d5..62ea38e08f 100644
--- a/lib/string_decoder.js
+++ b/lib/string_decoder.js
@@ -1,9 +1,9 @@
'use strict';
-const isEncoding = Buffer.isEncoding;
-
function assertEncoding(encoding) {
- if (encoding && !isEncoding(encoding)) {
+ // Do not cache `Buffer.isEncoding`, some modules monkey-patch it to support
+ // additional encodings
+ if (encoding && !Buffer.isEncoding(encoding)) {
throw new Error('Unknown encoding: ' + encoding);
}
}