(xmlgraphics-commons) branch main updated: FOP-3321: Improve error message when invalid PS setpagedevice used

[ss...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-commons.git


The following commit(s) were added to refs/heads/main by this push:
     new d7c703a  FOP-3321: Improve error message when invalid PS setpagedevice used
d7c703a is described below

commit d7c703a57351f500dd5a3f45e2e25df94b73d13a
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Wed Jun 3 13:30:59 2026 +0100

    FOP-3321: Improve error message when invalid PS setpagedevice used
---
 .../org/apache/xmlgraphics/ps/PSDictionary.java    |  3 ++
 .../xmlgraphics/ps/PSDictionaryTestCase.java       | 33 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/main/java/org/apache/xmlgraphics/ps/PSDictionary.java b/src/main/java/org/apache/xmlgraphics/ps/PSDictionary.java
index 965d694..5a95196 100644
--- a/src/main/java/org/apache/xmlgraphics/ps/PSDictionary.java
+++ b/src/main/java/org/apache/xmlgraphics/ps/PSDictionary.java
@@ -195,6 +195,9 @@ public class PSDictionary extends java.util.HashMap {
                     throw new PSDictionaryFormatException("Failed to parse object key");
                 }
                 Token valueToken = nextToken(str, keyToken.endIndex + 1);
+                if (valueToken == null) {
+                    throw new PSDictionaryFormatException("Failed to parse object value");
+                }
                 String[] braces = null;
                 for (String[] brace : BRACES) {
                     if (valueToken.value.startsWith(brace[OPENING])) {
diff --git a/src/test/java/org/apache/xmlgraphics/ps/PSDictionaryTestCase.java b/src/test/java/org/apache/xmlgraphics/ps/PSDictionaryTestCase.java
new file mode 100644
index 0000000..5ee0a6b
--- /dev/null
+++ b/src/test/java/org/apache/xmlgraphics/ps/PSDictionaryTestCase.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xmlgraphics.ps;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
+
+public class PSDictionaryTestCase {
+    @Test
+    public void testInvalidMediaPosition() {
+        Exception ex = Assert.assertThrows(PSDictionaryFormatException.class, new ThrowingRunnable() {
+                public void run() throws Throwable {
+                    PSDictionary.valueOf("<![CDATA[ << /MediaPosition   >> ]] >");
+                }
+            });
+        Assert.assertEquals("Failed to parse object value", ex.getMessage());
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org