Fix Issue #230: Error: Uncaught TypeError: undefined is not a function on <Buffer>.copy()

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2014-06-25 13:13:55 -04:00
parent c3681d4db6
commit 25f2a24cdf
1 changed files with 37 additions and 2 deletions

View File

@ -56,6 +56,27 @@ function standard_check_result_cb(callback) {
}; };
} }
/**
* Coerce array-like data to Buffer so we can .copy(), etc.
* Allow null, a Buffer, or an object that can be dealt with
* by the Buffer constructor (e.g., Typed Array, Array, ...)
*/
function ensureBuffer(maybeBuffer) {
if(!maybeBuffer) {
return null;
}
if(Buffer.isBuffer(maybeBuffer)) {
return maybeBuffer;
}
try {
return new Buffer(maybeBuffer);
} catch(e) {
return null;
}
}
/** /**
* Update node times. Only passed times are modified (undefined times are ignored) * Update node times. Only passed times are modified (undefined times are ignored)
* and filesystem flags are examined in order to override update logic. * and filesystem flags are examined in order to override update logic.
@ -753,7 +774,10 @@ function write_data(context, ofd, buffer, offset, length, position, callback) {
if(error) { if(error) {
callback(error); callback(error);
} else { } else {
fileData = result; fileData = ensureBuffer(result);
if(!fileData) {
return callback(new Errors.EIO('Expected Buffer'));
}
var _position = (!(undefined === position || null === position)) ? position : ofd.position; var _position = (!(undefined === position || null === position)) ? position : ofd.position;
var newSize = Math.max(fileData.length, _position + length); var newSize = Math.max(fileData.length, _position + length);
var newData = new Buffer(newSize); var newData = new Buffer(newSize);
@ -793,7 +817,10 @@ function read_data(context, ofd, buffer, offset, length, position, callback) {
if(error) { if(error) {
callback(error); callback(error);
} else { } else {
fileData = result; fileData = ensureBuffer(result);
if(!fileData) {
return callback(new Errors.EIO('Expected Buffer'));
}
var _position = (!(undefined === position || null === position)) ? position : ofd.position; var _position = (!(undefined === position || null === position)) ? position : ofd.position;
length = (_position + length > buffer.length) ? length - _position : length; length = (_position + length > buffer.length) ? length - _position : length;
fileData.copy(buffer, offset, _position, _position + length); fileData.copy(buffer, offset, _position, _position + length);
@ -1180,6 +1207,10 @@ function truncate_file(context, path, length, callback) {
if (error) { if (error) {
callback(error); callback(error);
} else { } else {
fileData = ensureBuffer(fileData);
if(!fileData) {
return callback(new Errors.EIO('Expected Buffer'));
}
var data = new Buffer(length); var data = new Buffer(length);
data.fill(0); data.fill(0);
if(fileData) { if(fileData) {
@ -1234,6 +1265,10 @@ function ftruncate_file(context, ofd, length, callback) {
callback(error); callback(error);
} else { } else {
var data; var data;
fileData = ensureBuffer(fileData);
if(!fileData) {
return callback(new Errors.EIO('Expected Buffer'));
}
if(fileData) { if(fileData) {
data = fileData.slice(0, length); data = fileData.slice(0, length);
} else { } else {