[YouTube] Quote signature deobfuscation function name and add semicolon only where needed

Author: AudricV

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSignatureUtils.java

@@ -6,6 +6,7 @@
 import org.schabi.newpipe.extractor.utils.jsextractor.JavaScriptExtractor;
 
 import javax.annotation.Nonnull;
+import java.util.regex.Pattern;
 
 /**
  * Utility class to get the signature timestamp of YouTube's base JavaScript player and deobfuscate
@@ -94,7 +95,7 @@ static String getDeobfuscationCode(@Nonnull final String javaScriptPlayerCode)
                     + deobfuscationFunctionName
                     + "(a);}";
 
-            return helperObject + deobfuscationFunction + callerFunction;
+            return helperObject + deobfuscationFunction + ";" + callerFunction;
         } catch (final Exception e) {
             throw new ParsingException("Could not parse deobfuscation function", e);
         }
@@ -124,25 +125,25 @@ private static String getDeobfuscateFunctionWithLexer(
             @Nonnull final String deobfuscationFunctionName) throws ParsingException {
         final String functionBase = deobfuscationFunctionName + "=function";
         return functionBase + JavaScriptExtractor.matchToClosingBrace(
-                javaScriptPlayerCode, functionBase) + ";";
+                javaScriptPlayerCode, functionBase);
     }
 
     @Nonnull
     private static String getDeobfuscateFunctionWithRegex(
             @Nonnull final String javaScriptPlayerCode,
             @Nonnull final String deobfuscationFunctionName) throws ParsingException {
         final String functionPattern = DEOBF_FUNC_REGEX_START
-                + deobfuscationFunctionName.replace("$", "\\$")
+                + Pattern.quote(deobfuscationFunctionName)
                 + DEOBF_FUNC_REGEX_END;
-        return "var " + Parser.matchGroup1(functionPattern, javaScriptPlayerCode) + ";";
+        return "var " + Parser.matchGroup1(functionPattern, javaScriptPlayerCode);
     }
 
     @Nonnull
     private static String getHelperObject(@Nonnull final String javaScriptPlayerCode,
                                           @Nonnull final String helperObjectName)
             throws ParsingException {
         final String helperPattern = SIG_DEOBF_HELPER_OBJ_REGEX_START
-                + helperObjectName.replace("$", "\\$")
+                + Pattern.quote(helperObjectName)
                 + SIG_DEOBF_HELPER_OBJ_REGEX_END;
         return Parser.matchGroup1(helperPattern, javaScriptPlayerCode)
                 .replace("\n", "");