fix for strang \0 buffer encoding issue in node v0.3.0

Author: brianc

lib/connection.js

@@ -74,7 +74,7 @@ p.startup = function(config) {
 
 p.password = function(password) {
   //0x70 = 'p'
-  this.send(0x70, Buffer(password + '\0', this.encoding));
+  this.send(0x70, new Writer().addCString(password).join());
 };
 
 p.send = function(code, bodyBuffer) {
@@ -97,7 +97,7 @@ p.end = function() {
 
 p.query = function(text) {
   //0x51 = Q
-  this.send(0x51, new Buffer(text + '\0', this.encoding));
+  this.send(0x51, new Writer().addCString(text).join());
 };
 
 p.parse = function(query) {
@@ -181,9 +181,7 @@ p.end = function() {
 };
 
 p.describe = function(msg) {
-  var str = msg.type + (msg.name || "" ) + '\0';
-  var buffer = Buffer(str, this.encoding);
-  this.send(0x44, buffer);
+  this.send(0x44, new Writer().addCString(msg.type + (msg.name || '')).join());
 };
 
 //parsing methods

lib/writer.js

@@ -32,7 +32,11 @@ p.addInt32 = function(val, first) {
 };
 
 p.addCString = function(val) {
-  return this.add(Buffer(val + '\0','utf8'));
+  var len = Buffer.byteLength(val);
+  var buffer = new Buffer(len+1);
+  buffer.write(val);
+  buffer[len] = 0;
+  return this.add(buffer);
 };
 
 p.addChar = function(char, first) {

test/buffer-list.js

@@ -27,8 +27,12 @@ p.addInt32 = function(val, first) {
   ]),first);
 };
 
-p.addCString = function(val) {
-  return this.add(Buffer(val + '\0','utf8'));
+p.addCString = function(val, front) {
+  var len = Buffer.byteLength(val);
+  var buffer = new Buffer(len+1);
+  buffer.write(val);
+  buffer[len] = 0;
+  return this.add(buffer, front);
 };
 
 p.addChar = function(char, first) {

test/unit/connection/inbound-parser-tests.js

@@ -57,7 +57,7 @@ var oneFieldBuf = new BufferList()
   .addCString('test')
   .join(true, 'D');
 
-var oneFieldBuf = buffers.dataRow(['test\0']);
+var oneFieldBuf = buffers.dataRow(['test']);
 
 
 var expectedAuthenticationOkayMessage = {
@@ -67,9 +67,9 @@ var expectedAuthenticationOkayMessage = {
 
 var expectedParameterStatusMessage = {
   name: 'parameterStatus',
-  length: 25,
   parameterName: 'client_encoding',
-  parameterValue: 'UTF8'
+  parameterValue: 'UTF8',
+  length: 25
 };
 
 var expectedBackendKeyDataMessage = {
@@ -246,7 +246,7 @@ test('Connection', function() {
       });
 
       test('field is correct', function() {
-        assert.equal(message.fields[0],'test\0');
+        assert.equal(message.fields[0],'test');
       });
     });