buffer: throw if both length and enc are passed

PR-URL: nodejs#4514 Reviewed-By: Rod Vagg <[email protected]> Reviewed-By: Vladimir Kurchatkin <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Trevor Norris <[email protected]> Reviewed-By: Сковорода Никита Андреевич <[email protected]>
scovetta · Apr 2, 2016 · a161031 · a161031
1 parent eae1dac
commit a161031
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -47,6 +47,11 @@ function alignPool() {
 function Buffer(arg, encoding) {
   // Common case.
   if (typeof arg === 'number') {
+    if (typeof encoding === 'string') {
+      throw new Error(
+        'If encoding is specified then the first argument must be a string'
+      );
+    }
     // If less than zero, or NaN.
     if (arg < 0 || arg !== arg)
       arg = 0;

diff --git a/test/sequential/test-buffer-bad-overload.js b/test/sequential/test-buffer-bad-overload.js
@@ -0,0 +1,15 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+
+assert.doesNotThrow(function() {
+  new Buffer(10);
+});
+
+assert.throws(function() {
+  new Buffer(10, 'hex');
+});
+
+assert.doesNotThrow(function() {
+  new Buffer('deadbeaf', 'hex');
+});