This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi-xmlbeans.git
The following commit(s) were added to refs/heads/trunk by this push:
new c8854bb8 Close the XsbReader when resolveHandle meets an unhandled
file type (#108)
c8854bb8 is described below
commit c8854bb8ffcde562cc94925ca5d2b1edc1e62579
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Sep 7 12:48:16 2026 +0100
Close the XsbReader when resolveHandle meets an unhandled file type (#108)
SchemaTypeSystemImpl.resolveHandle opens an XsbReader, then dispatches on
the
file type it finds. Each finishLoadingXxx() closes the reader in a finally,
but
the default arm throws IllegalStateException without closing, leaking the
underlying .xsb stream.
The arm is reachable: FILETYPE_SCHEMAPOINTER is a file type the compiler
writes but this switch does not handle, as is any type read from a corrupt
or
crafted .xsb.
Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
---
.../xmlbeans/impl/schema/SchemaTypeSystemImpl.java | 3 +
.../impl/schema/ResolveHandleFileTypeTest.java | 84 ++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git
a/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
index 510d1d94..db20d41b 100644
--- a/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
+++ b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
@@ -979,6 +979,9 @@ public class SchemaTypeSystemImpl extends
SchemaTypeLoaderBase implements Schema
result = reader.finishLoadingIdentityConstraint();
break;
default:
+ // every finishLoadingXxx() above closes the reader in a
finally;
+ // this arm has to release it before unwinding
+ reader.readEnd();
throw new IllegalStateException("Illegal handle type");
}
diff --git
a/src/test/java/org/apache/xmlbeans/impl/schema/ResolveHandleFileTypeTest.java
b/src/test/java/org/apache/xmlbeans/impl/schema/ResolveHandleFileTypeTest.java
new file mode 100644
index 00000000..4e37af63
--- /dev/null
+++
b/src/test/java/org/apache/xmlbeans/impl/schema/ResolveHandleFileTypeTest.java
@@ -0,0 +1,84 @@
+/* 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.xmlbeans.impl.schema;
+
+import org.apache.xmlbeans.ResourceLoader;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ResolveHandleFileTypeTest {
+
+ private static class TrackingInputStream extends ByteArrayInputStream {
+ private boolean closed;
+
+ TrackingInputStream(byte[] bytes) {
+ super(bytes);
+ }
+
+ @Override
+ public void close() throws IOException {
+ closed = true;
+ super.close();
+ }
+ }
+
+ // A complete, readable .xsb header for a file type that resolveHandle
does not
+ // know how to load, followed by an empty string pool.
+ private static byte[] pointerFile() throws IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ DataOutputStream dos = new DataOutputStream(bos);
+ dos.writeInt(SchemaTypeSystemImpl.DATA_BABE);
+ dos.writeShort(SchemaTypeSystemImpl.MAJOR_VERSION);
+ dos.writeShort(SchemaTypeSystemImpl.MINOR_VERSION);
+ dos.writeShort(0); // release number
+ dos.writeShort(SchemaTypeSystemImpl.FILETYPE_SCHEMAPOINTER);
+ dos.writeShort(1); // string pool holding no entries
+ dos.flush();
+ return bos.toByteArray();
+ }
+
+ @Test
+ void closesReaderOnUnhandledFileType() throws Exception {
+ TrackingInputStream stream = new TrackingInputStream(pointerFile());
+
+ SchemaTypeSystemImpl typeSystem = new SchemaTypeSystemImpl("test");
+ Field loaderF =
SchemaTypeSystemImpl.class.getDeclaredField("_resourceLoader");
+ loaderF.setAccessible(true);
+ loaderF.set(typeSystem, new ResourceLoader() {
+ @Override
+ public InputStream getResourceAsStream(String resourceName) {
+ return stream;
+ }
+
+ @Override
+ public void close() {
+ }
+ });
+
+ assertThrows(IllegalStateException.class, () ->
typeSystem.resolveHandle("h"));
+ assertTrue(stream.closed, "the reader should have been closed before
unwinding");
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]