diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-13 13:56:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-02-14 13:54:03 +0000 |
| commit | 6190a8210e089195aca9b5091fcc7166fca3beaf (patch) | |
| tree | ff760602dfba9de5163b1160cf98b370350341af /external | |
| parent | f4238ed900cdfa65d447fbef81b2e8ae95095a4e (diff) | |
disable script dump
Change-Id: I04d740cc0fcf87daa192a0a6af34138278043a19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146905
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/hsqldb/UnpackedTarball_hsqldb.mk | 1 | ||||
| -rw-r--r-- | external/hsqldb/patches/disable-dump-script.patch | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk index 389572377fa6..0b05b45ba3c3 100644 --- a/external/hsqldb/UnpackedTarball_hsqldb.mk +++ b/external/hsqldb/UnpackedTarball_hsqldb.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \ external/hsqldb/patches/jdbc-4.1.patch \ external/hsqldb/patches/multipleResultSets.patch \ + external/hsqldb/patches/disable-dump-script.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/patches/disable-dump-script.patch b/external/hsqldb/patches/disable-dump-script.patch new file mode 100644 index 000000000000..13e0213f7e57 --- /dev/null +++ b/external/hsqldb/patches/disable-dump-script.patch @@ -0,0 +1,36 @@ +--- a/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-13 11:08:11.297243034 +0000 ++++ b/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-13 13:49:17.973089433 +0000 +@@ -392,31 +392,19 @@ + */ + private Result processScript() throws IOException, HsqlException { + +- String token = tokenizer.getString(); +- ScriptWriterText dsw = null; ++ tokenizer.getString(); + + session.checkAdmin(); + + try { + if (tokenizer.wasValue()) { +- if (tokenizer.getType() != Types.VARCHAR) { +- throw Trace.error(Trace.INVALID_IDENTIFIER); +- } +- +- dsw = new ScriptWriterText(database, token, true, true, true); +- +- dsw.writeAll(); +- +- return new Result(ResultConstants.UPDATECOUNT); ++ throw Trace.error(Trace.ACCESS_IS_DENIED); + } else { + tokenizer.back(); + + return DatabaseScript.getScript(database, false); + } + } finally { +- if (dsw != null) { +- dsw.close(); +- } + } + } + |