This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ae9eb8385263a89f01b49d50e8e207e8b20ba352 Author: Arrigo Marchiori <[email protected]> AuthorDate: Tue Sep 8 22:52:04 2026 +0200 Limit paths for text caches for embedded databases (cherry picked and adapted from commit b81185736b1dc1d0d31d3c6399b1242bd42a93a5) --- main/hsqldb/makefile.mk | 2 +- main/hsqldb/patches/text_tables.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk index 6f1d193b75..db0f2f27b1 100644 --- a/main/hsqldb/makefile.mk +++ b/main/hsqldb/makefile.mk @@ -49,7 +49,7 @@ CONVERTFILES=build$/build.xml \ src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \ src$/org$/hsqldb$/Library.java -PATCH_FILES=patches$/i121754.patch patches$/script.patch +PATCH_FILES=patches$/i121754.patch patches$/script.patch patches$/text_tables.patch .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= diff --git a/main/hsqldb/patches/text_tables.patch b/main/hsqldb/patches/text_tables.patch new file mode 100644 index 0000000000..896c8dc3ce --- /dev/null +++ b/main/hsqldb/patches/text_tables.patch @@ -0,0 +1,13 @@ +diff -ru misc/hsqldb/src/org/hsqldb/persist/Log.java misc/build/hsqldb/src/org/hsqldb/persist/Log.java +--- misc/hsqldb/src/org/hsqldb/persist/Log.java 2008-03-14 16:47:42.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/persist/Log.java 2026-09-08 22:40:39.681242533 +0200 +@@ -763,7 +763,7 @@ + + closeTextCache(table); + +- if (!properties.isPropertyTrue( ++ if (database.isStoredFileAccess() || !properties.isPropertyTrue( + HsqlDatabaseProperties.textdb_allow_full_path)) { + if (source.indexOf("..") != -1) { + throw (Trace.error(Trace.ACCESS_IS_DENIED, source)); +
