aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElyse <26639800+elyse0@users.noreply.github.com>2022-08-19 00:30:04 -0500
committerpukkandan <pukkandan.ytdlp@gmail.com>2022-08-31 21:01:22 +0530
commitf26af78a8ac11d9d617ed31ea5282cfaa5bcbcfa (patch)
tree697fefb123fb9afeb53804d7b7e4d6bc674f7daf
parentbfbecd1174a9e2ee08117352c26e664d36f1cc17 (diff)
downloadhypervideo-pre-f26af78a8ac11d9d617ed31ea5282cfaa5bcbcfa.tar.lz
hypervideo-pre-f26af78a8ac11d9d617ed31ea5282cfaa5bcbcfa.tar.xz
hypervideo-pre-f26af78a8ac11d9d617ed31ea5282cfaa5bcbcfa.zip
[jsinterp] Add `charcodeAt` and bitwise overflow (#4706)
Authored by: elyse0
-rw-r--r--test/test_jsinterp.py16
-rw-r--r--yt_dlp/jsinterp.py14
2 files changed, 27 insertions, 3 deletions
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index 778607fb2..4b6e22bac 100644
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -352,6 +352,22 @@ class TestJSInterpreter(unittest.TestCase):
''')
self.assertEqual(jsi.call_function('x').flags & re.I, re.I)
+ def test_char_code_at(self):
+ jsi = JSInterpreter('function x(i){return "test".charCodeAt(i)}')
+ self.assertEqual(jsi.call_function('x', 0), 116)
+ self.assertEqual(jsi.call_function('x', 1), 101)
+ self.assertEqual(jsi.call_function('x', 2), 115)
+ self.assertEqual(jsi.call_function('x', 3), 116)
+ self.assertEqual(jsi.call_function('x', 4), None)
+ self.assertEqual(jsi.call_function('x', 'not_a_number'), 116)
+
+ def test_bitwise_operators_overflow(self):
+ jsi = JSInterpreter('function x(){return -524999584 << 5}')
+ self.assertEqual(jsi.call_function('x'), 379882496)
+
+ jsi = JSInterpreter('function x(){return 1236566549 << 5}')
+ self.assertEqual(jsi.call_function('x'), 915423904)
+
if __name__ == '__main__':
unittest.main()
diff --git a/yt_dlp/jsinterp.py b/yt_dlp/jsinterp.py
index 99bdca927..51c7beed4 100644
--- a/yt_dlp/jsinterp.py
+++ b/yt_dlp/jsinterp.py
@@ -18,10 +18,11 @@ from .utils import (
def _js_bit_op(op):
+ def zeroise(x):
+ return 0 if x in (None, JS_Undefined) else x
+
def wrapped(a, b):
- def zeroise(x):
- return 0 if x in (None, JS_Undefined) else x
- return op(zeroise(a), zeroise(b))
+ return op(zeroise(a), zeroise(b)) & 0xffffffff
return wrapped
@@ -692,6 +693,13 @@ class JSInterpreter:
return obj.index(idx, start)
except ValueError:
return -1
+ elif member == 'charCodeAt':
+ assertion(isinstance(obj, str), 'must be applied on a string')
+ assertion(len(argvals) == 1, 'takes exactly one argument')
+ idx = argvals[0] if isinstance(argvals[0], int) else 0
+ if idx >= len(obj):
+ return None
+ return ord(obj[idx])
idx = int(member) if isinstance(obj, list) else member
return obj[idx](argvals, allow_recursion=allow_recursion)