hsqldb: read textdb.allow_full_path only as a Java system property
as hsqldb 2.x does since 2.1.0 Change-Id: I17101ccd6e8af3adee46644b197d94498b4f32fb Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/13829 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 866cad0af60543757ea2ef5a2c484dc79f20d3d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211814 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
committed by
Xisco Fauli
parent
970058a668
commit
1440fb4cb8
+1
@@ -34,6 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
|
||||
external/hsqldb/patches/applet.patch.0 \
|
||||
external/hsqldb/patches/hsqldb-jar-timestamps.patch.1 \
|
||||
external/hsqldb/patches/lockfile.patch.1 \
|
||||
external/hsqldb/patches/allow-full-path-system-property.patch.1 \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From 80a589cc94dd3c67d7cbf978ca4c4328b84eb856 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
|
||||
Date: Tue, 29 Sep 2026 15:41:04 +0000
|
||||
Subject: [PATCH] read textdb.allow_full_path only as a Java system property
|
||||
|
||||
HSQLDB 2.x reads it that way since 2.1.0, see svn r3769
|
||||
https://github.com/ryenus/hsqldb/commit/909e46eb5aea11a38aad3d1f57f5a656eba8132e
|
||||
---
|
||||
src/org/hsqldb/persist/Log.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/org/hsqldb/persist/Log.java b/src/org/hsqldb/persist/Log.java
|
||||
index 284d9f4..18c698b 100644
|
||||
--- a/src/org/hsqldb/persist/Log.java
|
||||
+++ b/src/org/hsqldb/persist/Log.java
|
||||
@@ -763,7 +763,7 @@ public class Log {
|
||||
|
||||
closeTextCache(table);
|
||||
|
||||
- if (!properties.isPropertyTrue(
|
||||
+ if (!Boolean.getBoolean(
|
||||
HsqlDatabaseProperties.textdb_allow_full_path)) {
|
||||
if (source.indexOf("..") != -1) {
|
||||
throw (Trace.error(Trace.ACCESS_IS_DENIED, source));
|
||||
--
|
||||
2.55.0
|
||||
|
||||
Reference in New Issue
Block a user