diff options
| author | sepro <sepro@sepr0.com> | 2025-03-24 22:28:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-24 22:28:47 +0100 |
| commit | 9491b44032b330e05bd5eaa546187005d1e8538e (patch) | |
| tree | f03348bd9247c796e435e6d63b3abcce37a87c67 | |
| parent | b7fbb5a0a16a8e8d3e29c29e26ebed677d0d6ea3 (diff) | |
[utils] `js_to_json`: Make function less fatal (#12715)
Authored by: seproDev
| -rw-r--r-- | test/test_utils.py | 1 | ||||
| -rw-r--r-- | yt_dlp/utils/_utils.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 42dc7f937..e60ceed8f 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1260,6 +1260,7 @@ class TestUtil(unittest.TestCase): def test_js_to_json_malformed(self): self.assertEqual(js_to_json('42a1'), '42"a1"') self.assertEqual(js_to_json('42a-1'), '42"a"-1') + self.assertEqual(js_to_json('{a: `${e("")}`}'), '{"a": "\\"e\\"(\\"\\")"}') def test_js_to_json_template_literal(self): self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"') diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py index 0140acaa3..24525560e 100644 --- a/yt_dlp/utils/_utils.py +++ b/yt_dlp/utils/_utils.py @@ -2767,7 +2767,8 @@ def js_to_json(code, vars={}, *, strict=False): def template_substitute(match): evaluated = js_to_json(match.group(1), vars, strict=strict) if evaluated[0] == '"': - return json.loads(evaluated) + with contextlib.suppress(json.JSONDecodeError): + return json.loads(evaluated) return evaluated def fix_kv(m): |