Merge pull request #37 from rii-mango/korbinian90-patch-1

Korbinian90 patch 1 (with release related additions)
rii-mango · Nov 13, 2023 · e65e736 · e65e736
2 parents a4ce01d + 77749d0
commit e65e736
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 11 deletions.
diff --git a/.github/workflows/test-linux-node18.yml b/.github/workflows/test-linux-node18.yml
@@ -5,7 +5,7 @@ name: test-linux-node18
 
 on:
   pull_request:
-    branches: [main]
+    branches: [master]
 
 jobs:
   build:

diff --git a/dist/src/nifti1.d.ts.map b/dist/src/nifti1.d.ts.map
diff --git a/dist/src/nifti1.js b/dist/src/nifti1.js
diff --git a/dist/src/nifti1.js.map b/dist/src/nifti1.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nifti-reader-js",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "A JavaScript NIfTI file format reader.",
   "main": "dist/src/nifti.js",
   "browser": "release/current/nifti-reader.js",

diff --git a/release/current/nifti-reader-min.js b/release/current/nifti-reader-min.js
diff --git a/release/current/nifti-reader.js b/release/current/nifti-reader.js
@@ -2562,7 +2562,12 @@ var require_nifti1 = __commonJS({
           this.extensionFlag[1] = utilities_1.Utils.getByteAt(rawData, 348 + 1);
           this.extensionFlag[2] = utilities_1.Utils.getByteAt(rawData, 348 + 2);
           this.extensionFlag[3] = utilities_1.Utils.getByteAt(rawData, 348 + 3);
-          if (this.extensionFlag[0]) {
+          let isExtensionCapable = true;
+          if (!this.isHDR && this.vox_offset <= 352)
+            isExtensionCapable = false;
+          if (rawData.byteLength <= 352 + 16)
+            isExtensionCapable = false;
+          if (isExtensionCapable && this.extensionFlag[0]) {
             this.extensions = utilities_1.Utils.getExtensionsAt(rawData, this.getExtensionLocation(), this.littleEndian, this.vox_offset);
             this.extensionSize = this.extensions[0].esize;
             this.extensionCode = this.extensions[0].ecode;

diff --git a/src/nifti1.ts b/src/nifti1.ts
@@ -388,7 +388,14 @@ import { Utils } from "./utilities";
         this.extensionFlag[1] = Utils.getByteAt(rawData, 348 + 1);
         this.extensionFlag[2] = Utils.getByteAt(rawData, 348 + 2);
         this.extensionFlag[3] = Utils.getByteAt(rawData, 348 + 3);
-        if (this.extensionFlag[0]) {
+
+        let isExtensionCapable = true;
+        if ((!this.isHDR) && (this.vox_offset <= 352))
+          isExtensionCapable = false;
+        if (rawData.byteLength <= (352 + 16))
+          isExtensionCapable = false;
+
+        if (isExtensionCapable && this.extensionFlag[0]) {
           // read our extensions
           this.extensions = Utils.getExtensionsAt(
             rawData,
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ name: test-linux-node18 @@
     on:
       pull_request:
-        branches: [main]
+        branches: [master]
     jobs:
       build:
@@ Expand Down @@