PDFBOX-5288: push "rdf:li" element; fix push/pop imbalance

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930078 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java

@@ -548,8 +548,17 @@ private AbstractField parseLiElement(XMPMetadata xmp, QName descriptor, Element
         Element liChild = DomHelper.getUniqueElementChild(liElement);
         if (liChild != null)
         {
-            nsFinder.push(liChild);
-            return parseLiDescription(xmp, descriptor, liChild);
+            try
+            {
+                nsFinder.push(liElement);
+                nsFinder.push(liChild);
+                return parseLiDescription(xmp, descriptor, liChild);
+            }
+            finally
+            {
+                nsFinder.pop();
+                nsFinder.pop();
+            }
         }
         else
         {

xmpbox/src/test/java/org/apache/xmpbox/xml/DomXmpParserTest.java

@@ -116,4 +116,38 @@ void testPDFBox6106() throws XmpParsingException
                 () -> xmpParser.parse(s.getBytes(StandardCharsets.UTF_8)));
         Assertions.assertEquals("No type defined for {http://ns.adobe.com/pdf/1.3/}CreationDate", ex.getMessage());
     }
+
+    /**
+     * PDFBOX-5288: check that namespace declaration within an "rdf:li" element is found.
+     *
+     * @throws XmpParsingException
+     */
+    @Test
+    void testPDFBox5288() throws XmpParsingException
+    {
+        String s = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+                    "<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?><x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"Public XMP Toolkit Core 4.0  \">\n" +
+                    " \n" +
+                    " <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+                    "  \n" +
+                    "  <rdf:Description xmlns:xmpMM=\"http://ns.adobe.com/xap/1.0/mm/\" rdf:about=\"\">\n" +
+                    "   <xmpMM:DocumentID>uidd:1f0e03977b90b6365a376454ffdf34a7</xmpMM:DocumentID>\n" +
+                    "   <xmpMM:History>\n" +
+                    "    <rdf:Seq>\n" +
+                    "     <rdf:li xmlns:stEvt=\"http://ns.adobe.com/xap/1.0/sType/ResourceEvent#\">\n" +
+                    "      <rdf:Description>\n" +
+                    "       <stEvt:action>created</stEvt:action>\n" +
+                    "       <stEvt:parameters>iDRS PDF output engine 7</stEvt:parameters>\n" +
+                    "       <stEvt:when>2022-09-12T12:00:07+02:00</stEvt:when>\n" +
+                    "      </rdf:Description>\n" +
+                    "     </rdf:li>\n" +
+                    "    </rdf:Seq>\n" +
+                    "   </xmpMM:History>\n" +
+                    "  </rdf:Description>\n" +
+                    " </rdf:RDF>\n" +
+                    "</x:xmpmeta><?xpacket end=\"w\"?>";
+        DomXmpParser xmpParser = new DomXmpParser();
+        XMPMetadata xmp = xmpParser.parse(s.getBytes(StandardCharsets.UTF_8));
+        Assertions.assertNotNull(xmp.getXMPMediaManagementSchema());
+    }
 }