fix(emscripten): save and restore the stack with a run

Addresses issues with multiple invocations. #760 Co-authored-by: Forrest Li <forrest.li@kitware.com>
InsightSoftwareConsortium · Oct 11, 2023 · e99c3e4 · e99c3e4
1 parent 24f8230
commit e99c3e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/pipeline/PipelineEmscriptenModule.ts b/src/pipeline/PipelineEmscriptenModule.ts
@@ -12,6 +12,8 @@ interface PipelineEmscriptenModule extends EmscriptenModule {
   writeArrayToMemory: typeof writeArrayToMemory;
   writeAsciiToMemory: typeof writeAsciiToMemory;
   AsciiToString: (ptr: number) => string;
+  stackSave: () => number;
+  stackRestore: (ptr: number) => void;
 
   resetModuleStdout: () => void;
   resetModuleStderr: () => void;

diff --git a/src/pipeline/internal/runPipelineEmscripten.ts b/src/pipeline/internal/runPipelineEmscripten.ts
@@ -291,6 +291,7 @@ function runPipelineEmscripten (pipelineModule: PipelineEmscriptenModule, args:
 
   pipelineModule.resetModuleStdout()
   pipelineModule.resetModuleStderr()
+  const stackPtr = pipelineModule.stackSave()
   let returnValue = 0
   try {
     returnValue = pipelineModule.callMain(args.slice())
@@ -308,6 +309,8 @@ function runPipelineEmscripten (pipelineModule: PipelineEmscriptenModule, args:
       }
     }
     throw exception
+  } finally {
+    pipelineModule.stackRestore(stackPtr)
   }
   const stdout = pipelineModule.getModuleStdout()
   const stderr = pipelineModule.getModuleStderr()