Merge pull request #335 from rdvincent/master

natacha-beck · web-flow · commit 5882c456b23b · 2017-08-27T22:52:30.000-04:00
Fix #332, correctly handle HDF5 files with impossible values for data offset in the layout message.
diff --git a/src/brainbrowser/volume-viewer/volume-loaders/hdf5.js b/src/brainbrowser/volume-viewer/volume-loaders/hdf5.js
@@ -1884,7 +1884,8 @@
     }
 
     function loadData(link) {
-      if (link.chunk_size !== 0) {
+      if (link.chunk_size !== 0 &&
+          link.data_offset > 0 && link.data_offset < superblk.eof_addr) {
         seek(link.data_offset);
 
         var n_bytes = 1;

Original file line number	Diff line number	Diff line change
`@@ -1884,7 +1884,8 @@`
`1884`	`1884`	`}`
`1885`	`1885`
`1886`	`1886`	`function loadData(link) {`
`1887`		`- if (link.chunk_size !== 0) {`
	`1887`	`+ if (link.chunk_size !== 0 &&`
	`1888`	`+ link.data_offset > 0 && link.data_offset < superblk.eof_addr) {`
`1888`	`1889`	`seek(link.data_offset);`
`1889`	`1890`
`1890`	`1891`	`var n_bytes = 1;`