scripting/source/pyprov/pythonscript.py | 5 +++++
sfx2/source/doc/objmisc.cxx | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 41f9c16e19c39e3574b4ae16a85662074226953f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 26 10:18:09 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Aug 27 12:37:20 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>
(cherry picked from commit ffad51e9e625a22f1efab3da7886baf4134b444f)
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 3779150791fc..5c7beb7e4e2c 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1381,7 +1381,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 e52591c1f8fb38b53ea88b22b9e5a5b2be93c3e7
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 19 11:27:15 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Aug 27 12:37:13 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>
(cherry picked from commit 52f7aa318722bd17c77ee5c4fa8307936e7b53af)
diff --git a/scripting/source/pyprov/pythonscript.py
b/scripting/source/pyprov/pythonscript.py
index a5ef31a4bf12..c46565949665 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 d2aa5d9baecf42b717a6d90feacb41ad14567f0c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 16 10:18:34 2019 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Aug 27 12:37:05 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
(cherry picked from commit 5445f7ffd09e891b220dabb19cd013bcf591fc08)
diff --git a/scripting/source/pyprov/pythonscript.py
b/scripting/source/pyprov/pythonscript.py
index 316c5012cf31..a5ef31a4bf12 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
