external/frozen/cid1538304_reference_ctor.0 | 17 +++++++++++++++++
pyuno/source/module/pyuno_runtime.cxx | 15 +++++++++------
sfx2/source/view/lokcharthelper.cxx | 2 +-
3 files changed, 27 insertions(+), 7 deletions(-)
New commits:
commit 1ca97423ab6980a6f6d85c2ca52e400c56baa1e1
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 29 09:21:16 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 29 14:14:25 2023 +0200
cid#1545913 Big parameter passed by value
Change-Id: I5fd72f80a01808f9c24dae7ab6e79391fc9603da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157400
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/frozen/cid1538304_reference_ctor.0
b/external/frozen/cid1538304_reference_ctor.0
index 8ed0a7533fd4..c627686cd2bd 100644
--- a/external/frozen/cid1538304_reference_ctor.0
+++ b/external/frozen/cid1538304_reference_ctor.0
@@ -14,3 +14,20 @@
: map{items, Compare{}} {}
constexpr map(std::initializer_list<value_type> items, Compare const
&compare)
+--- include/frozen/set.h 2023-09-29 09:19:22.208195458 +0100
++++ include/frozen/set.h 2023-09-29 09:20:21.175291240 +0100
+@@ -59,12 +59,12 @@
+ /* constructors */
+ constexpr set(const set &other) = default;
+
+- constexpr set(container_type keys, Compare const & comp)
++ constexpr set(const container_type& keys, Compare const & comp)
+ : less_than_{comp}
+ , keys_(bits::quicksort(keys, less_than_)) {
+ }
+
+- explicit constexpr set(container_type keys)
++ explicit constexpr set(const container_type& keys)
+ : set{keys, Compare{}} {}
+
+ constexpr set(std::initializer_list<Key> keys, Compare const & comp)
commit ace3634dacfc177a9ad92db8b2d0b596891c1814
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 29 09:15:00 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 29 14:14:18 2023 +0200
cid#1546831 Dereference after null check
Change-Id: I8c51dd1b312f02534f138b4fe6752ad26f5ac96c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157399
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sfx2/source/view/lokcharthelper.cxx
b/sfx2/source/view/lokcharthelper.cxx
index c7941e6aa2ac..f8e8ec47ea4e 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -175,7 +175,7 @@ bool LokChartHelper::HitAny(const Point& aPos, bool
bNegativeX)
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while (pViewShell)
{
- if (pViewShell->GetDocId() == pCurView->GetDocId() &&
pViewShell->getPart() == nPartForCurView)
+ if (pCurView && pViewShell->GetDocId() == pCurView->GetDocId() &&
pViewShell->getPart() == nPartForCurView)
{
LokChartHelper aChartHelper(pViewShell, bNegativeX);
if (aChartHelper.Hit(aPos))
commit 86160b081b316532ed83cb9365714a06b1c13326
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 29 08:52:19 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 29 14:14:13 2023 +0200
cid#1546834 Unchecked return value
Change-Id: Id2c54c61d3d44611ab02db81b8e64cedb0010ba7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157398
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 7f3eb7a6e95f..799752fefee3 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -239,14 +239,17 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE
**ppFile )
*ppFile = stderr;
else
{
- oslProcessInfo data;
- data.Size = sizeof( data );
- osl_getProcessInfo(
- nullptr , osl_Process_IDENTIFIER , &data );
osl_getSystemPathFromFileURL( str.pData, &str.pData);
OString o = OUStringToOString( str, osl_getThreadTextEncoding() );
- o += ".";
- o += OString::number( data.Ident );
+
+ oslProcessInfo data;
+ data.Size = sizeof( data );
+ if (osl_getProcessInfo(
+ nullptr , osl_Process_IDENTIFIER , &data ) == osl_Process_E_None)
+ {
+ o += ".";
+ o += OString::number(data.Ident);
+ }
*ppFile = fopen( o.getStr() , "w" );
if ( *ppFile )
