othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(DIMSE): Switch from new Buffer() to Buffer.alloc() (CWE-665)

Browse Source
This commit is contained in:
Erik Ziegler 2018-08-13 14:28:36 +02:00
parent c09b54924e
commit a2b6566ee9
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/ohif-dicom-services/server/DIMSE/Message.js
View File

@ -282,7 +282,7 @@ DicomMessage.readMetaHeader = function(bufferOrFile, callback) {
return quitWithError('Cannot open file', callback); return quitWithError('Cannot open file', callback);
} }
var buffer = new Buffer(16); var buffer = Buffer.alloc(16);
fs.read(fd, buffer, 0, 16, 128, function(err, bytesRead) { fs.read(fd, buffer, 0, 16, 128, function(err, bytesRead) {
if (err || bytesRead != 16) { if (err || bytesRead != 16) {
fs.closeSync(fd); fs.closeSync(fd);
@ -297,7 +297,7 @@ DicomMessage.readMetaHeader = function(bufferOrFile, callback) {
var el = readAElement(stream, useSyntax), var el = readAElement(stream, useSyntax),
metaLength = el.value, metaLength = el.value,
metaBuffer = new Buffer(metaLength); metaBuffer = Buffer.alloc(metaLength);
fs.read(fd, metaBuffer, 0, metaLength, 144, function(err, bytesRead) { fs.read(fd, metaBuffer, 0, metaLength, 144, function(err, bytesRead) {
fs.closeSync(fd); fs.closeSync(fd);

2
Packages/ohif-dicom-services/server/DIMSE/PDU.js
View File

@ -127,7 +127,7 @@ PDU.splitPData = function(pdata, maxSize) {
} }
var readChunk = function(fd, bufferSize, slice, callback) { var readChunk = function(fd, bufferSize, slice, callback) {
var buffer = new Buffer(bufferSize), length = slice.length, start = slice.start; var buffer = Buffer.alloc(bufferSize), length = slice.length, start = slice.start;
fs.read(fd, buffer, 0, length, start, function(err, bytesRead) { fs.read(fd, buffer, 0, length, start, function(err, bytesRead) {
callback(err, bytesRead, buffer, slice); callback(err, bytesRead, buffer, slice);
}); });

4
Packages/ohif-dicom-services/server/DIMSE/RWStream.js
View File

@ -47,7 +47,7 @@ RWStream.prototype.getReadType = function(type) {
WriteStream = function() { WriteStream = function() {
RWStream.call(this); RWStream.call(this);
this.defaultBufferSize = 512; //512 bytes this.defaultBufferSize = 512; //512 bytes
this.rawBuffer = new Buffer(this.defaultBufferSize); this.rawBuffer = Buffer.alloc(this.defaultBufferSize);
this.offset = 0; this.offset = 0;
this.contentSize = 0; this.contentSize = 0;
}; };
@ -73,7 +73,7 @@ WriteStream.prototype.checkSize = function(length) {
if (this.offset + length > this.rawBuffer.length) { if (this.offset + length > this.rawBuffer.length) {
// we need more size, copying old one to new buffer // we need more size, copying old one to new buffer
var oldLength = this.rawBuffer.length, var oldLength = this.rawBuffer.length,
newBuffer = new Buffer(oldLength + length + (oldLength / 2)); newBuffer = Buffer.alloc(oldLength + length + (oldLength / 2));
this.rawBuffer.copy(newBuffer, 0, 0, this.contentSize); this.rawBuffer.copy(newBuffer, 0, 0, this.contentSize);
this.rawBuffer = newBuffer; this.rawBuffer = newBuffer;
} }