Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/parseDicom.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,20 @@ export default function parseDicom(byteArray, options = {}) {
// main function here
function parseTheByteStream() {
const metaHeaderDataSet = readPart10Header(byteArray, options);
const dataSet = readDataSet(metaHeaderDataSet);

return mergeDataSets(metaHeaderDataSet, dataSet);
try {
const dataSet = readDataSet(metaHeaderDataSet);
return mergeDataSets(metaHeaderDataSet, dataSet);
} catch (e) {
// If an exception is thrown when parsing main dataset (i.e. truncated
// byte array), go ahead and include everything parsed so far in the exception.
if (e.dataSet) {
e.dataSet = mergeDataSets(metaHeaderDataSet, e.dataSet);
}
throw e;
}
}

// This is where we actually start parsing
return parseTheByteStream();
}
Expand Down
17 changes: 17 additions & 0 deletions test/parseDicom_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,21 @@ describe('parseDicom', () => {
expect(dataSet.string('x00201041')).to.equal('-43');
});

it('should parse a truncated byte array and return all parsed elements in the exception (explicitLittleEndian)', () => {
// Arrange
const byteArray = makeExplicitLittleEndianTestData();
// Truncate between x00201041 and x00280010
const partialByteArray = byteArray.slice(0, 320)

// Act
try {
const dataSet = parseDicom(partialByteArray);
} catch (err) {
// Assert
assertMetaHeaderElements(err.dataSet, '1.2.840.10008.1.2.1', 159);
expect(err.dataSet.string('x00020010')).to.equal('1.2.840.10008.1.2.1')
expect(err.dataSet.string('x00201041')).to.equal('-43');
// expect(err.dataSet.uint16('x00280010')).to.equal(512);
}
});
});