Skip to content

Commit badb33a

Browse files
committed
Fixes for node 0.8.
1 parent 99f76ca commit badb33a

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/binding.cc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ class Connection : public ObjectWrap {
892892
} else if(val->IsNull()) {
893893
paramValues[i] = NULL;
894894
} else if(val->IsObject() && Buffer::HasInstance(val)) {
895-
char *cHexString = MallocCHexString(val);
895+
char *cHexString = MallocCHexString(val->ToObject());
896896
if(!cHexString) {
897897
LOG("ArgToCStringArray: OUT OF MEMORY OR SOMETHING BAD!");
898898
ReleaseCStringArray(paramValues, i-1);
@@ -931,23 +931,23 @@ class Connection : public ObjectWrap {
931931
}
932932

933933
//helper function to Malloc a Bytea encoded Hex string from a buffer
934-
static char* MallocCHexString(v8::Handle<Value> buf)
934+
static char* MallocCHexString(v8::Handle<Object> buf)
935935
{
936-
char* bufferData = Buffer::Data(buf);
937-
size_t hexStringLen = Buffer::Length(buf)*2 + 3;
938-
char *cHexString = (char *) malloc(hexStringLen);
939-
if(!cHexString) {
940-
return cHexString;
941-
}
942-
strcpy(cHexString, "\\x");
943-
for (uint32_t i = 0, k = 2; k < hexStringLen; i += 1, k += 2) {
944-
static const char hex[] = "0123456789abcdef";
945-
uint8_t val = static_cast<uint8_t>(bufferData[i]);
946-
cHexString[k + 0] = hex[val >> 4];
947-
cHexString[k + 1] = hex[val & 15];
948-
}
949-
cHexString[hexStringLen-1] = 0;
936+
char* bufferData = Buffer::Data(buf);
937+
size_t hexStringLen = Buffer::Length(buf)*2 + 3;
938+
char *cHexString = (char *) malloc(hexStringLen);
939+
if(!cHexString) {
950940
return cHexString;
941+
}
942+
strcpy(cHexString, "\\x");
943+
for (uint32_t i = 0, k = 2; k < hexStringLen; i += 1, k += 2) {
944+
static const char hex[] = "0123456789abcdef";
945+
uint8_t val = static_cast<uint8_t>(bufferData[i]);
946+
cHexString[k + 0] = hex[val >> 4];
947+
cHexString[k + 1] = hex[val & 15];
948+
}
949+
cHexString[hexStringLen-1] = 0;
950+
return cHexString;
951951
}
952952

953953
void SendCopyFromChunk(Handle<Object> chunk) {

0 commit comments

Comments
 (0)