Revert "buffer.toString() shouldn't include null values"

This reverts commit 909a5b39d20f3cb72ed8c102b181ee46b886a54e.

Will fix inside V8's String::New instead.

diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index b7c5d859adb3e07b20c2f335c815f2c3a400fce4..8b48f2a2e623cd6b24618928b77387e487b29ffa 100644 (file)
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -232,8 +232,7 @@ Handle<Value> Buffer::AsciiSlice(const Arguments &args) {
   SLICE_ARGS(args[0], args[1])
 
   char* data = parent->data_ + start;
-  size_t len = strnlen(data, end - start);
-  Local<String> string = String::New(data, len);
+  Local<String> string = String::New(data, end - start);
 
   return scope.Close(string);
 }
@@ -243,13 +242,11 @@ Handle<Value> Buffer::Utf8Slice(const Arguments &args) {
   HandleScope scope;
   Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This());
   SLICE_ARGS(args[0], args[1])
-  char* data = parent->data_ + start;
-  size_t len = strnlen(data, end - start);
-  Local<String> string = String::New(data, len);
+  char *data = parent->data_ + start;
+  Local<String> string = String::New(data, end - start);
   return scope.Close(string);
 }
 
-
 Handle<Value> Buffer::Ucs2Slice(const Arguments &args) {
   HandleScope scope;
   Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This());
@@ -259,7 +256,6 @@ Handle<Value> Buffer::Ucs2Slice(const Arguments &args) {
   return scope.Close(string);
 }
 
-
 static const char *base64_table = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                   "abcdefghijklmnopqrstuvwxyz"
                                   "0123456789+/";

diff --git a/test/simple/test-buffer.js b/test/simple/test-buffer.js
index 5db92283f446e919c7f157e55a95b6ce3c115de1..0aad8149f792d26da4b65d613c8c6c09443f7e31 100644 (file)
--- a/test/simple/test-buffer.js
+++ b/test/simple/test-buffer.js
@@ -410,15 +410,3 @@ assert.equal(12, Buffer.byteLength('Il était tué', 'binary'));
 
 // slice(0,0).length === 0
 assert.equal(0, Buffer('hello').slice(0, 0).length);
-
-
-// toString('utf8') should not include null values
-var b = new Buffer(20);
-for (var i = 0; i < b.length; i++) {
-  b[i] = 0;
-}
-b.write('hello');
-assert.equal('hello', b.toString('utf8'));
-assert.equal('hello', b.toString('ascii'));
-
-