Merge pull request processing#4045 from JakubValtar/fix-preproc-crash

benfry · benfry · commit 2ce18a28e87d · 2015-10-22T11:32:41.000-04:00
Prevent preprocessor from crashing when setup() has no body
diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -299,13 +299,14 @@ make sure that it uses numbers (or displayWidth/Height), copy into settings
         MatchResult setupMatch = findInCurrentScope(VOID_SETUP_REGEX, uncommented);
         if (setupMatch != null) {
           int start = uncommented.indexOf("{", setupMatch.end());
-
-          // Find a closing brace
-          MatchResult match = findInCurrentScope(CLOSING_BRACE, uncommented, start);
-          if (match != null) {
-            searchArea = uncommented.substring(start + 1, match.end() - 1);
-          } else {
-            throw new SketchException("Found a { that's missing a matching }", false);
+          if (start >= 0) {
+            // Find a closing brace
+            MatchResult match = findInCurrentScope(CLOSING_BRACE, uncommented, start);
+            if (match != null) {
+              searchArea = uncommented.substring(start + 1, match.end() - 1);
+            } else {
+              throw new SketchException("Found a { that's missing a matching }", false);
+            }
           }
         }
         break;
