POI: 60293 -- Handle illegal "Odd" header/footer in XWPF

https://svn.apache.org/viewvc?view=revision&revision=1767353
nissl-lab · May 14, 2023 · e241f51 · e241f51
1 parent 416015e
commit e241f51
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/OpenXmlFormats/Wordprocessing/HdrFtr.cs b/OpenXmlFormats/Wordprocessing/HdrFtr.cs
@@ -547,7 +547,16 @@ public class CT_HdrFtrRef : CT_Rel
                 return null;
             CT_HdrFtrRef ctObj = new CT_HdrFtrRef();
             if (node.Attributes["w:type"] != null)
-                ctObj.type = (ST_HdrFtr)Enum.Parse(typeof(ST_HdrFtr), node.Attributes["w:type"].Value);
+            {
+                try
+                {
+                    ctObj.type = (ST_HdrFtr)Enum.Parse(typeof(ST_HdrFtr), node.Attributes["w:type"].Value);
+                }
+                catch (ArgumentException)
+                {
+                    ctObj.type = ST_HdrFtr.@default;
+                }
+            }
             ctObj.id = XmlHelper.ReadString(node.Attributes["r:id"]);
             return ctObj;
         }
@@ -1904,4 +1913,4 @@ public string id
             }
         }
     }
-}
+}
diff --git a/testcases/ooxml/XWPF/UserModel/TestXWPFHeader.cs b/testcases/ooxml/XWPF/UserModel/TestXWPFHeader.cs
@@ -224,5 +224,13 @@ public void TestGetPictureDataById()
         {
             // TODO
         }
-   }
+
+        [Test]
+        public void Bug60293()
+        {
+            //test handling of non-standard header/footer options
+            XWPFDocument xwpf = XWPFTestDataSamples.OpenSampleDocument("60293.docx");
+            Assert.AreEqual(3, xwpf.HeaderList.Count);
+        }
+    }
 }
diff --git a/testcases/test-data/document/60293.docx b/testcases/test-data/document/60293.docx