Merge bab2e67113 into f2a4983df7

[cookies] Fix --cookies-from-browser=safari with unusual field order
These fields can be specified in any order. `DataParser` doesn't support skipping backwards, so I make a temporary copy for each.
2024-11-25 08:41:28 +01:00 · 2024-11-13 18:08:39 +08:00 · 2024-05-03 17:42:02 -07:00
1 changed files with 9 additions and 6 deletions
--- a/yt_dlp/cookies.py
+++ b/yt_dlp/cookies.py
@ -678,14 +678,17 @@ def _parse_safari_cookies_record(data, jar, logger):
    _creation_date = _mac_absolute_time_to_posix(p.read_double())  # noqa: F841

    try:
-        p.skip_to(domain_offset)
-        domain = p.read_cstring()
+        temp = DataParser(data, logger)
+        temp.skip_to(domain_offset)
+        domain = temp.read_cstring()

-        p.skip_to(name_offset)
-        name = p.read_cstring()
+        temp = DataParser(data, logger)
+        temp.skip_to(name_offset)
+        name = temp.read_cstring()

-        p.skip_to(path_offset)
-        path = p.read_cstring()
+        temp = DataParser(data, logger)
+        temp.skip_to(path_offset)
+        path = temp.read_cstring()

        p.skip_to(value_offset)
        value = p.read_cstring()
Author	SHA1	Message	Date
rcombs	e3cedfd973	Merge `bab2e67113` into `f2a4983df7`	2024-11-13 18:08:39 +08:00
rcombs	bab2e67113	[cookies] Fix --cookies-from-browser=safari with unusual field order These fields can be specified in any order. `DataParser` doesn't support skipping backwards, so I make a temporary copy for each.	2024-05-03 17:42:02 -07:00