configure.ac | 2 +- scripting/source/pyprov/pythonscript.py | 5 +++++ sfx2/source/doc/objmisc.cxx | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit e9a339ad44bc988144b0f57f93be8ab8ff7e8eef Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Sat Oct 19 20:18:39 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 19 20:18:39 2019 +0200 Bump version to 5.3-67 Change-Id: I00819b80e1b1e66553d29521603ca203056fe0d5 diff --git a/configure.ac b/configure.ac index 3e97bde46b57..9dafa17c62a9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.66],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.67],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) commit 63c2b3c66db8780ba67a956d944dd282852f8b73 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Mon Aug 26 10:18:09 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 19 20:16:56 2019 +0200 Improve check Change-Id: I8280a81eef2ced0ff0ace51ea9f094421abafe13 Reviewed-on: https://gerrit.libreoffice.org/78108 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit 761e6dd25782420bf06e4a2ff3205a79b6cbb136) Reviewed-on: https://gerrit.libreoffice.org/78129 Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 2b2d3976b270..f9b967d529aa 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1451,7 +1451,7 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) do { OUString aToken = sScript.getToken(0, '/', nIndex); - if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) + if (aToken.startsWithIgnoreAsciiCase("LibreLogo") || aToken.indexOf('~') != -1) { return true; } commit 5694150ee0f07ad19a05d8a10cb88c6cfab63c26 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Mon Aug 19 11:27:15 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 19 20:16:44 2019 +0200 Improve check for absolute URI Change-Id: I4dee44832107f72f8f3fb68554428dc1e646c346 Reviewed-on: https://gerrit.libreoffice.org/77706 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit c79efeb66f7951305d0334bc288aee1c571a8728) Reviewed-on: https://gerrit.libreoffice.org/77724 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 4d34fbf90c75..bc3d189bbcfb 100644 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -237,7 +237,7 @@ class MyUriHelper: log.debug( message ) raise RuntimeException( message ) - if xFileUri.isAbsolute(): + if not xFileUri.hasRelativePath(): message = "pythonscript: an absolute uri is invalid '" + sFileUri+ "'" log.debug( message ) raise RuntimeException( message ) commit fc79280930915cae660e1be4a79f16c70774f0c9 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Aug 16 10:18:34 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 19 20:16:28 2019 +0200 an absolute uri is invalid input Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc Reviewed-on: https://gerrit.libreoffice.org/77564 Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Tested-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103) Reviewed-on: https://gerrit.libreoffice.org/77572 Tested-by: Jenkins diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 5a6730cffde1..4d34fbf90c75 100644 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -237,6 +237,11 @@ class MyUriHelper: log.debug( message ) raise RuntimeException( message ) + if xFileUri.isAbsolute(): + message = "pythonscript: an absolute uri is invalid '" + sFileUri+ "'" + log.debug( message ) + raise RuntimeException( message ) + # absolute path to the .py file xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN) sAbsScriptUri = xAbsScriptUri.getUriReference() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits