From c2e0cb97050215e40b67ea68d146591ca5495bf3 Mon Sep 17 00:00:00 2001
From: Jakub Valtar <jakub.valtar@gmail.com>
Date: Fri, 21 Apr 2017 12:35:52 +0200
Subject: [PATCH] Scrub comments: skip the second chracter in the escape
 sequence

Fixes #5016
---
 .../src/processing/mode/java/preproc/PdePreprocessor.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
index f76516af8..5a68752d1 100644
--- a/java/src/processing/mode/java/preproc/PdePreprocessor.java
+++ b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -730,10 +730,16 @@ public class PdePreprocessor {
           throw new RuntimeException("Missing the */ from the end of a " +
                                      "/* comment */");
         }
-      } else if (p[index] == '"' && index > 0 && p[index-1] != '\\') {
+
+        // switch in/out of quoted region
+      } else if (p[index] == '"') {
         insideQuote = !insideQuote;
         index++;
 
+        // skip the escaped char
+      } else if (insideQuote && p[index] == '\\') {
+        index += 2;
+
       } else {  // any old character, move along
         index++;
       }