Fix bug of JavaScript compressing may result in Stack Overflow

zhourenjian · zhourenjian · commit 0266fa77cacd · 2009-02-10T14:55:34.000Z
diff --git a/src/net/sf/j2s/core/compiler/RegExCompress.java b/src/net/sf/j2s/core/compiler/RegExCompress.java
@@ -48,15 +48,22 @@ public static String regexCompress(String str) {
 		String cssCodes = null;
 		int idx1 = str.indexOf("$WTC$$.registerCSS");
 		int idx2 = -1;
-		String specialFunKey = "@324@();\r\n";
-		if (idx1 != -1) {
-			idx2 = str.indexOf("\");\r\n", idx1);
-			if (idx2 != -1) {
+		int idx = idx1;
+		while (idx != -1) {
+			int index = str.indexOf("\");\r\n", idx);
+			if (index != -1) {
+				idx2 = index + 5;
 				ignoreCSS = true;
-				cssCodes = str.substring(idx1, idx2 + 5);
-				str = str.substring(0, idx1) + specialFunKey + str.substring(idx2 + 5);
+				idx = str.indexOf("$WTC$$.registerCSS", idx2);
+			} else {
+				break;
 			}
 		}
+		String specialFunKey = "@324@();\r\n";
+		if (ignoreCSS) {
+			cssCodes = str.substring(idx1, idx2);
+			str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);
+		}
 		String regEx = "('[^\\n\\r]*[^\\\\]')|" + // 1:1
 				"(\"([^\\n\\r\\\"]|\\\\\\\")*[^\\\\]\")|" + // 1:3
 				"(\\/\\/[^\\n\\r]*[\\n\\r])|" + // 1:4
@@ -70,7 +77,7 @@ public static String regexCompress(String str) {
 				"(\\s+)",
 				"$1$2$8$9");
 		if (ignoreCSS) {
-			int idx = str.indexOf(specialFunKey);
+			idx = str.indexOf(specialFunKey);
 			if (idx != -1) {
 				str = str.substring(0, idx) + cssCodes + str.substring(idx + specialFunKey.length());
 			} else {
@@ -85,14 +92,21 @@ public static String regexCompress2(String str) {
 		String cssCodes = null;
 		int idx1 = str.indexOf("$WTC$$.registerCSS");
 		int idx2 = -1;
-		String specialFunKey = "@324@();\r\n";
-		if (idx1 != -1) {
-			idx2 = str.indexOf("\");\r\n", idx1);
-			if (idx2 != -1) {
+		int idx = idx1;
+		while (idx != -1) {
+			int index = str.indexOf("\");\r\n", idx);
+			if (index != -1) {
+				idx2 = index + 5;
 				ignoreCSS = true;
-				cssCodes = str.substring(idx1, idx2 + 5);
-				str = str.substring(0, idx1) + specialFunKey + str.substring(idx2 + 5);
+				idx = str.indexOf("$WTC$$.registerCSS", idx2);
+			} else {
+				break;
+			}
 			}
+		String specialFunKey = "@324@();\r\n";
+		if (ignoreCSS) {
+			cssCodes = str.substring(idx1, idx2);
+			str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);
 		}
 		String whiteSpace = "[ \\f\\t\\v]";
 		String regEx = "('[^\\n\\r]*[^\\\\]')|" + // 1:1
@@ -108,7 +122,7 @@ public static String regexCompress2(String str) {
 				"(" + whiteSpace + "+)",
 				"$1$2$8$9");
 		if (ignoreCSS) {
-			int idx = str.indexOf(specialFunKey);
+			idx = str.indexOf(specialFunKey);
 			if (idx != -1) {
 				str = str.substring(0, idx) + cssCodes + str.substring(idx + specialFunKey.length());
 			} else {
