fix matchToClosingParenthesis for extracting more complex nsig functions

TeamNewPipe · Aug 12, 2022 · b672d37 · b672d37
1 parent d120036
commit b672d37
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/StringUtils.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/StringUtils.java
@@ -23,14 +23,13 @@ public static String matchToClosingParenthesis(@Nonnull final String string,
         }
 
         startIndex += start.length();
-        int endIndex = startIndex;
-        while (string.charAt(endIndex) != '{') {
-            ++endIndex;
-        }
+        int endIndex = findNextParenthesis(string, startIndex, true);
         ++endIndex;
 
         int openParenthesis = 1;
         while (openParenthesis > 0) {
+            endIndex = findNextParenthesis(string, endIndex, false);
+
             switch (string.charAt(endIndex)) {
                 case '{':
                     ++openParenthesis;
@@ -46,4 +45,45 @@ public static String matchToClosingParenthesis(@Nonnull final String string,
 
         return string.substring(startIndex, endIndex);
     }
+
+    private static int findNextParenthesis(@Nonnull final String string, final int offset,
+                                           final boolean onlyOpen) {
+        boolean lastEscaped = false;
+        char quote = ' ';
+
+        for (int i = offset; i < string.length(); i++) {
+            boolean thisEscaped = false;
+            final char c = string.charAt(i);
+
+            switch (c) {
+                case '{':
+                    if (quote == ' ') {
+                        return i;
+                    }
+                    break;
+                case '}':
+                    if (!onlyOpen && quote == ' ') {
+                        return i;
+                    }
+                    break;
+                case '\\':
+                    if (!lastEscaped) {
+                        thisEscaped = true;
+                    }
+                    break;
+                case '\'':
+                case '"':
+                    if (!lastEscaped) {
+                        if (quote == ' ') {
+                            quote = c;
+                        } else if (quote == c) {
+                            quote = ' ';
+                        }
+                    }
+            }
+
+            lastEscaped = thisEscaped;
+        }
+        return -1;
+    }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/utils/StringUtilsTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/utils/StringUtilsTest.java
@@ -58,4 +58,14 @@ public void lessClosing__success() {
 
         assertEquals(expected, substring);
     }
+
+    @Test
+    public void find_closing_with_quotes() {
+        String expected = "{return \",}\\\"/\"}";
+        String string = "function(d){return \",}\\\"/\"}";
+
+        String substring = matchToClosingParenthesis(string, "function(d)");
+
+        assertEquals(expected, substring);
+    }
 }