Fix bug of JavaScript compressing may result in Stack Overflow

zhourenjian · zhourenjian · commit a8e944ada4d4 · 2009-02-10T14:55:34.000Z
diff --git a/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/RegExCompress.java b/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/RegExCompress.java
@@ -103,15 +103,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
@@ -125,7 +132,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 {
@@ -140,15 +147,22 @@ 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
 				"(\"([^\\n\\r\\\"]|\\\\\\\")*[^\\\\]\")|" + // 2:2,3
@@ -163,7 +177,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 {
diff --git a/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/UTF8Concat.java b/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/UTF8Concat.java
@@ -67,6 +67,7 @@ public static void main(String[] args) {
 				if (s.startsWith(j2sKeySig)) {
 					s = s.substring(j2sKeySig.length());
 				}
+				System.out.println("Packing " + src.getName() + " ...");
 				//*
 				if (noCompressing) {
 					buf.append(s);

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public static void main(String[] args) {`
`67`	`67`	`if (s.startsWith(j2sKeySig)) {`
`68`	`68`	`s = s.substring(j2sKeySig.length());`
`69`	`69`	`}`
	`70`	`+ System.out.println("Packing " + src.getName() + " ...");`
`70`	`71`	`//*`
`71`	`72`	`if (noCompressing) {`
`72`	`73`	`buf.append(s);`