Merge pull request #189 from ethereum/worker-catch-exceptions

Catch solc exception in the worker the same way as the non-worker version

Merge pull request #189 from ethereum/worker-catch-exceptions
7698da2e · Alex Beregszaszi · GitHub · 5aeb1365 · bd71078e · 7698da2e
Commit 7698da2e authored Aug 31, 2016 by Alex Beregszaszi Committed by GitHub Aug 31, 2016
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

compiler-worker.js src/app/compiler-worker.js +4 -0

No files found.
--- a/src/app/compiler-worker.js
+++ b/src/app/compiler-worker.js
@@ -16,10 +16,14 @@ module.exports = function (self) {
        var compiler = solc(self.Module);

        compileJSON = function (input, optimize) {
+          try {
            return JSON.stringify(compiler.compile(JSON.parse(input), optimize, function (path) {
              missingInputs.push(path);
              return { 'error': 'Deferred import' };
            }));
+          } catch (exception) {
+            return JSON.stringify({ error: 'Uncaught JavaScript exception:\n' + exception });
+          }
        };

        self.postMessage({