aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2020-11-17 01:30:43 +0700
committerSergey M․ <dstftw@gmail.com>2020-11-17 01:30:43 +0700
commitfe07e788bf7718d429d6fc7e4bcb0c761ffd2cfc (patch)
tree1830df3e5dc69983c293384a62403a2d31b9f696
parent6d3bdcf2177ce75f8f95731186a4794412b9776d (diff)
downloadyoutube-dl-fe07e788bf7718d429d6fc7e4bcb0c761ffd2cfc.tar.xz
[utils] Skip ! prefixed code in js_to_json
-rw-r--r--test/test_utils.py22
-rw-r--r--youtube_dl/utils.py5
2 files changed, 25 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py
index c2d1e4fb1..925a21d34 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -937,6 +937,28 @@ class TestUtil(unittest.TestCase):
self.assertEqual(d['x'], 1)
self.assertEqual(d['y'], 'a')
+ # Just drop ! prefix for now though this results in a wrong value
+ on = js_to_json('''{
+ a: !0,
+ b: !1,
+ c: !!0,
+ d: !!42.42,
+ e: !!![],
+ f: !"abc",
+ g: !"",
+ !42: 42
+ }''')
+ self.assertEqual(json.loads(on), {
+ 'a': 0,
+ 'b': 1,
+ 'c': 0,
+ 'd': 42.42,
+ 'e': [],
+ 'f': "abc",
+ 'g': "",
+ '42': 42
+ })
+
on = js_to_json('["abc", "def",]')
self.assertEqual(json.loads(on), ['abc', 'def'])
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 737e2810e..321f903ab 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -4078,7 +4078,7 @@ def js_to_json(code):
v = m.group(0)
if v in ('true', 'false', 'null'):
return v
- elif v.startswith('/*') or v.startswith('//') or v == ',':
+ elif v.startswith('/*') or v.startswith('//') or v.startswith('!') or v == ',':
return ""
if v[0] in ("'", '"'):
@@ -4103,7 +4103,8 @@ def js_to_json(code):
{comment}|,(?={skip}[\]}}])|
(?:(?<![0-9])[eE]|[a-df-zA-DF-Z_])[.a-zA-Z_0-9]*|
\b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:{skip}:)?|
- [0-9]+(?={skip}:)
+ [0-9]+(?={skip}:)|
+ !+
'''.format(comment=COMMENT_RE, skip=SKIP_RE), fix_kv, code)