BUG: Handle annotations being None on merging (#3111)

Closes #3110.
py-pdf · Feb 9, 2025 · 912b50c · 912b50c
1 parent 5a50b57
commit 912b50c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pypdf/_writer.py b/pypdf/_writer.py
@@ -2932,14 +2932,16 @@ def _get_cloned_page(
 
     def _insert_filtered_annotations(
         self,
-        annots: Union[IndirectObject, List[DictionaryObject]],
+        annots: Union[IndirectObject, List[DictionaryObject], None],
         page: PageObject,
         pages: Dict[int, PageObject],
         reader: PdfReader,
     ) -> List[Destination]:
         outlist = ArrayObject()
         if isinstance(annots, IndirectObject):
             annots = cast("List[Any]", annots.get_object())
+        if annots is None:
+            return outlist
         for an in annots:
             ano = cast("DictionaryObject", an.get_object())
             if (

diff --git a/tests/test_writer.py b/tests/test_writer.py
@@ -2607,3 +2607,14 @@ def test_inline_image_q_operator_handling(tmp_path):
     )
     assert png_path.is_file()
     assert image_similarity(png_path, expected_png_path) >= 0.99999
+
+
+def test_insert_filtered_annotations__annotations_are_none():
+    writer = PdfWriter()
+    writer.add_blank_page(72, 72)
+    stream = BytesIO()
+    writer.write(stream)
+    reader = PdfReader(stream)
+    assert writer._insert_filtered_annotations(
+        annots=None, page=PageObject(), pages={}, reader=reader
+    ) == []