configure.ac | 8 ++++++--
download.lst | 4 ++--
external/nss/ExternalProject_nss.mk | 3 ++-
external/zlib/UnpackedTarball_zlib.mk | 4 ----
external/zlib/ubsan.patch | 11 -----------
fpicker/source/office/fileview.cxx | 10 +++++++---
hwpfilter/source/hwpread.cxx | 1 +
svtools/source/dialogs/ServerDetailsControls.cxx | 2 ++
vcl/source/outdev/hatch.cxx | 7 +++++++
9 files changed, 27 insertions(+), 23 deletions(-)
New commits:
commit 2861fcac6dd80b6e84e6853c2a47fe371b75e3a0
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 6 10:52:24 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:52:24 2022 +0200
Bump version to 6.4-60
Change-Id: I41359b8ea96fef0fc22c8fc5c8b6f461ffaca68a
diff --git a/configure.ac b/configure.ac
index 0095852d7459..c318a619bdbd 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],[6.4.10.59],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.60],[],[],[https://collaboraoffice.com/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 13809b9f0f2f985562553bdbd1c1f5a81fb064d8
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Mar 31 20:33:02 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:49:17 2022 +0200
nss: build with zlib module on WNT
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
diff --git a/configure.ac b/configure.ac
index a530bc311e67..0095852d7459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8275,7 +8275,11 @@ else
SYSTEM_ZLIB=
BUILD_TYPE="$BUILD_TYPE ZLIB"
ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
- ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
+ if test "$COM" = "MSC"; then
+ ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib"
+ else
+ ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
+ fi
fi
AC_SUBST(ZLIB_CFLAGS)
AC_SUBST(ZLIB_LIBS)
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index 49726ff224d4..7bcafb581479 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -26,9 +26,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
MOZ_DEBUG_FLAGS=" " \
OPT_CODE_SIZE=0) \
OS_TARGET=WIN95 \
+ USE_SYSTEM_ZLIB=1 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
- XCFLAGS="-arch:SSE $(SOLARINC)" \
+ XCFLAGS="-arch:SSE $(SOLARINC) $(ZLIB_CFLAGS)" \
$(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
NSS_DISABLE_GTESTS=1 \
commit e306f209126ebf3ff6c97dbf15577ffb3de405af
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Mar 31 12:13:23 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:49:13 2022 +0200
zlib: upgrade to release 1.2.12
Fixes CVE-2018-25032
external/zlib/ubsan.patch: remove, fixed upstream
Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit bfb6c4c65781a610d21409d974227d73f264f41a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132191
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit b91ebecaaa1582a7cbeda519eb6097a6a866135f)
diff --git a/download.lst b/download.lst
index d24e8b661a01..3771c13fdfba 100644
--- a/download.lst
+++ b/download.lst
@@ -275,8 +275,8 @@ export WPS_VERSION_MICRO := 10
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-export ZLIB_SHA256SUM :=
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
-export ZLIB_TARBALL := zlib-1.2.11.tar.xz
+export ZLIB_SHA256SUM :=
7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18
+export ZLIB_TARBALL := zlib-1.2.12.tar.xz
export ZMF_SHA256SUM :=
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
export ZMF_TARBALL := libzmf-0.0.2.tar.xz
diff --git a/external/zlib/UnpackedTarball_zlib.mk
b/external/zlib/UnpackedTarball_zlib.mk
index e74039d25089..dd9fc1c31445 100644
--- a/external/zlib/UnpackedTarball_zlib.mk
+++ b/external/zlib/UnpackedTarball_zlib.mk
@@ -18,8 +18,4 @@ $(eval $(call gb_UnpackedTarball_set_post_action,zlib,\
$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0))
-$(eval $(call gb_UnpackedTarball_add_patches,zlib, \
- external/zlib/ubsan.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/zlib/ubsan.patch b/external/zlib/ubsan.patch
deleted file mode 100644
index 2d7ff8d67967..000000000000
--- a/external/zlib/ubsan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trees.c
-+++ trees.c
-@@ -870,7 +870,7 @@
- bi_windup(s); /* align on byte boundary */
- put_short(s, (ush)stored_len);
- put_short(s, (ush)~stored_len);
-- zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
-+ if (stored_len != 0) zmemcpy(s->pending_buf + s->pending, (Bytef *)buf,
stored_len);
- s->pending += stored_len;
- #ifdef ZLIB_DEBUG
- s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
commit d202352dd9cd62c14f36f8446aadb510d7a0013a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 24 20:27:48 2021 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:49:08 2022 +0200
tdf#145842 canceling remote file delete makes file disappear from treeview
we remove the selected entries from the treeview, so the user cancel's
the deletion of an entry we should unselect it from the candidates to
remove.
and...
Related: tdf#145842 fix a crash after deleting an entry
delete an entry in remote files dialog and go one level up and crash,
ownership of the SvtContentEntry is not with the entry, but belongs
to mpImpl->maEntries
Change-Id: Ieb2258960fc647ad15d8f315a18454a0dae8a420
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125793
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit 9d13202243b26d507b61eb4a787d1df2ce037e21)
diff --git a/fpicker/source/office/fileview.cxx
b/fpicker/source/office/fileview.cxx
index 5b65eb1295cf..64dee0ee6239 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -636,16 +636,20 @@ void ViewTabListBox_Impl::DeleteEntries()
eResult = aDlg.run();
}
- if ( ( eResult == svtools::QUERYDELETE_ALL ) ||
- ( eResult == svtools::QUERYDELETE_YES ) )
+ bool bDeleted = false;
+
+ if (eResult == svtools::QUERYDELETE_ALL || eResult ==
svtools::QUERYDELETE_YES)
{
if ( Kill( aURL ) )
{
- delete
reinterpret_cast<SvtContentEntry*>(mxTreeView->get_id(rCurEntry).toInt64());
mpParent->EntryRemoved( aURL );
+ bDeleted = true;
}
}
+ if (!bDeleted)
+ mxTreeView->unselect(rCurEntry);
+
return false;
});
commit ad47ed1b740ba94c90ff659872282974f364cac8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 24 17:07:29 2021 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:49:00 2022 +0200
Resolves: tdf#145840 call ToggledDavsHdl on setting checkbox state
Change-Id: Ia2a735255b94fd3a097081950e2145e07b4b3b63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125723
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit b23a16ff513369b6bf1f534a387d911b6336c9c8)
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx
b/svtools/source/dialogs/ServerDetailsControls.cxx
index bfbc2e21593b..b3724f87ee00 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -175,11 +175,13 @@ bool DavDetailsContainer::verifyScheme( const OUString&
rScheme )
{
bValid = true;
m_pDialog->m_xCBDavs->set_active(false);
+ ToggledDavsHdl(*m_pDialog->m_xCBDavs);
}
else if ( rScheme == "https://"; )
{
bValid = true;
m_pDialog->m_xCBDavs->set_active(true);
+ ToggledDavsHdl(*m_pDialog->m_xCBDavs);
}
return bValid;
}
commit ce3175190443541cb26c571121838d5442bbd5b5
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Mar 11 17:29:41 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:48:49 2022 +0200
hwpfilter: why isn't that path string null terminated
Change-Id: Iaedc23bd91d0d46e34d55dcc65760b73c5772b7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131559
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 4c86ed851bc1c0a2414e254082064760c99437f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131589
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit dc566a7f687a728311490b5f4f624897f0aefd1d)
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 12f29a38925e..70d0d365c9ee 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -451,6 +451,7 @@ bool Picture::Read(HWPFile & hwpf)
scale[1] = tmp16;
hwpf.ReadBlock(picinfo.picun.path, 256); /* Picture File Name: when
type is not a Drawing. */
+ picinfo.picun.path[255] = 0; // ensure null terminated
hwpf.ReadBlock(reserved3, 9); /* Brightness / Contrast /
Picture Effect, etc. */
UpdateBBox(this);
commit 7b32ab1326b631a41de37c2c5f6c2af6b3a46215
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Mar 6 15:49:28 2022 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 6 10:48:25 2022 +0200
ofz: Too many hatch points
Change-Id: I08cb9d09a9bb48ab31763f50bc2fa23cf723330f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131014
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit bee0950a4c5bd996a8df0185b03c0f98e7a3de9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131370
Tested-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index 33ff9e648213..4d05467aacc4 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -370,7 +370,14 @@ void OutputDevice::DrawHatchLine( const tools::Line&
rLine, const tools::PolyPol
nAdd = 1;
if( nAdd )
+ {
+ if (nPCounter == HATCH_MAXPOINTS)
+ {
+ SAL_WARN("vcl.gdi", "too many hatch points");
+ return;
+ }
pPtBuffer[ nPCounter++ ] = Point( FRound( fX ),
FRound( fY ) );
+ }
}
aCurSegment.SetStart( aCurSegment.GetEnd() );
