Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Commit 7fe21d6

Browse files
chasechase
authored
Fix memory bugs (#88)
* Remove unused document formats and zxcvbn, which blocks building with the address sanitizer enabled * Fix use-after-free and uninitialized memory bugs
1 parent 64b4e76 commit 7fe21d6

File tree

19 files changed

+56
-156
lines changed

19 files changed

+56
-156
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.1.3
1+
v0.1.4

‎libreoffice-core/Repository.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
496496
vbahelper \
497497
) \
498498
vcl \
499-
writerperfect \
500499
xmlscript \
501500
xmlfa \
502501
xmlfd \
@@ -568,7 +567,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
568567
swd \
569568
t602filter \
570569
$(call gb_Helper_optional,SCRIPTING,vbaswobj) \
571-
wpftwriter \
572570
writerfilter \
573571
$(call gb_Helper_optional,DBCONNECTIVITY,writer) \
574572
))
@@ -1278,7 +1276,6 @@ $(eval $(call gb_Helper_register_uiconfigs,\
12781276
svx \
12791277
uui \
12801278
vcl \
1281-
writerperfect \
12821279
$(if $(ENABLE_NSS)$(ENABLE_OPENSSL),xmlsec) \
12831280
))
12841281

‎libreoffice-core/RepositoryExternal.mk

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4319,29 +4319,7 @@ endef
43194319

43204320
endif # SYSTEM_BOX2D
43214321

4322-
ifneq ($(SYSTEM_ZXCVBN),)
4323-
define gb_LinkTarget__use_zxcvbn-c
4324-
$(call gb_LinkTarget_set_include,$(1),\
4325-
-DSYSTEM_ZXCVBN \
4326-
$$(INCLUDE) \
4327-
)
4328-
$(call gb_LinkTarget_add_libs,$(1),-lzxcvbn)
4329-
endef
4330-
4331-
else
4332-
4333-
define gb_LinkTarget__use_zxcvbn-c
4334-
$(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c)
4335-
$(call gb_LinkTarget_set_include,$(1),\
4336-
-I$(call gb_UnpackedTarball_get_dir,zxcvbn-c)\
4337-
$$(INCLUDE) \
4338-
)
4339-
$(call gb_LinkTarget_use_static_libraries,$(1),\
4340-
zxcvbn-c \
4341-
)
4342-
endef
4343-
endif
4344-
4322+
# MACRO: unused zxcvbn removed
43454323

43464324
ifneq ($(SYSTEM_ZXING),)
43474325

‎libreoffice-core/RepositoryModule_host.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
187187
vcl \
188188
wizards \
189189
writerfilter \
190-
writerperfect \
191190
xmerge \
192191
$(call gb_Helper_optional,XMLHELP,xmlhelp) \
193192
xmloff \

‎libreoffice-core/configure.ac

Lines changed: 5 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5931,8 +5931,9 @@ if test "$cross_compiling" = "yes"; then
59315931
PYTHON
59325932
SCRIPTING
59335933
ZLIB
5934-
ZXCVBN
59355934
"
5935+
# MACRO: remove zxcvbn
5936+
59365937
# converts BUILD_TYPE and PERMITTED_BUILD_TARGETS into non-whitespace,
59375938
# newlined lists, to use grep as a filter
59385939
PERMITTED_BUILD_TARGETS=$(echo "$PERMITTED_BUILD_TARGETS" | sed -e '/^ *$/d' -e 's/ *//')
@@ -9732,49 +9733,7 @@ REVENGE_LIBS_internal="-L${librevenge_libdir} -lrevenge-0.0"
97329733
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1])
97339734

97349735
libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1])
9735-
9736-
libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.1])
9737-
9738-
WPD_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/libwpd/inc"
9739-
AS_IF([test "$COM" = "MSC"],
9740-
[libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
9741-
[libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"]
9742-
)
9743-
WPD_LIBS_internal="-L${libwpd_libdir} -lwpd-0.10"
9744-
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10])
9745-
9746-
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
9747-
9748-
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
9749-
libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.14])
9750-
9751-
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
9752-
9753-
libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
9754-
9755-
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
9756-
9757-
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.21])
9758-
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21])
9759-
9760-
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
9761-
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
9762-
9763-
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
9764-
9765-
libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
9766-
libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
9767-
9768-
libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
9769-
9770-
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
9771-
9772-
libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0])
9773-
9774-
libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
9775-
9776-
libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
9777-
libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7])
9736+
# MACRO: remove unused document formats
97789737

97799738
dnl ===================================================================
97809739
dnl Check for system lcms2
@@ -10905,19 +10864,7 @@ else
1090510864
fi
1090610865
AC_SUBST(TLS)
1090710866

10908-
dnl ===================================================================
10909-
dnl Check for system sane
10910-
dnl ===================================================================
10911-
AC_MSG_CHECKING([which sane header to use])
10912-
if test "$with_system_sane" = "yes"; then
10913-
AC_MSG_RESULT([external])
10914-
AC_CHECK_HEADER(sane/sane.h, [],
10915-
[AC_MSG_ERROR(sane not found. install sane)], [])
10916-
else
10917-
AC_MSG_RESULT([internal])
10918-
BUILD_TYPE="$BUILD_TYPE SANE"
10919-
fi
10920-
10867+
# MACRO: don't compile SANE (no scanner access anyway)
1092110868
dnl ===================================================================
1092210869
dnl Check for system icu
1092310870
dnl ===================================================================
@@ -11338,24 +11285,7 @@ AC_SUBST(SYSTEM_HUNSPELL)
1133811285
AC_SUBST(HUNSPELL_CFLAGS)
1133911286
AC_SUBST(HUNSPELL_LIBS)
1134011287

11341-
dnl ===================================================================
11342-
dnl Check for system zxcvbn
11343-
dnl ===================================================================
11344-
AC_MSG_CHECKING([which zxcvbn to use])
11345-
if test "$with_system_zxcvbn" = "yes"; then
11346-
AC_MSG_RESULT([external])
11347-
SYSTEM_ZXCVBN=TRUE
11348-
AC_CHECK_HEADER(zxcvbn.h, [],
11349-
[ AC_MSG_ERROR(zxcvbn headers not found.)], [])
11350-
AC_CHECK_LIB(zxcvbn, ZxcvbnMatch, [],
11351-
[ AC_MSG_ERROR(zxcvbn library not found.)], [])
11352-
else
11353-
AC_MSG_RESULT([internal])
11354-
BUILD_TYPE="$BUILD_TYPE ZXCVBN"
11355-
SYSTEM_ZXCVBN=
11356-
fi
11357-
AC_SUBST(SYSTEM_ZXCVBN)
11358-
11288+
# MACRO: remove zxcvbn
1135911289
dnl ===================================================================
1136011290
dnl Check for system zxing
1136111291
dnl ===================================================================

‎libreoffice-core/desktop/source/lib/wasm_extensions.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void* tileRendererWorker(void* data_)
7474
{
7575
d->doc->pClass->setView(d->doc, d->viewId);
7676
}
77-
std::fill_n(d->paintedTile, d->paintedTileAllocSize, 0);
77+
__builtin_memset(d->paintedTile, 0, d->paintedTileAllocSize);
7878
d->doc->pClass->paintTile(d->doc, d->paintedTile, d->tileSize, d->tileSize,
7979
d->tileTwips[0], d->tileTwips[1], d->tileTwips[2],
8080
d->tileTwips[3]);

‎libreoffice-core/desktop/wasm/tile_renderer_worker.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ function rendering() {
373373
docWidthTwips,
374374
visibleHeight,
375375
]);
376-
// TODO: mark missing and invalidate
377376
ctx.clearRect(0, 0, activeCanvas.width, activeCanvas.height);
378377
if (renderedHeightTwips !== scheduledHeightTwips) {
379378
canvases[0].height = scheduledHeightPx;
@@ -672,11 +671,9 @@ function seekNonVisibleRingIndex() {
672671
}
673672
}
674673

675-
let paintTimes: number[] = [];
676674
/** blocks the worker thread while painting a tile at tileIndex, returning the corresponding tileRingIndex */
677675
function blockingPaintTile(tileIndex: number): number {
678676
Atomics.wait(d.state, 0, RenderState.TILE_PAINT); // wait for existing paint to finish if necessary
679-
const start = Date.now();
680677
const rect = tileIndexToTwipsRect(tileIndex);
681678
for (let i = 0; i < RECT_SIZE; ++i) {
682679
Atomics.store(d.tileTwips, i, rect[i]);
@@ -701,7 +698,6 @@ function blockingPaintTile(tileIndex: number): number {
701698
)
702699
);
703700
validTiles.add(tileIndex);
704-
paintTimes.push(Date.now() - start);
705701

706702
return tileRingIndex;
707703
}

‎libreoffice-core/external/Module_external.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,11 @@ $(eval $(call gb_Module_add_moduledirs,external,\
9393
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
9494
$(call gb_Helper_optional,PYTHON,python3) \
9595
$(call gb_Helper_optional,QXP,libqxp) \
96-
$(call gb_Helper_optional,ZXCVBN,zxcvbn-c) \
9796
$(call gb_Helper_optional,ZXING,zxing) \
9897
$(call gb_Helper_optional,REDLAND,redland) \
9998
$(call gb_Helper_optional,REVENGE,librevenge) \
10099
$(call gb_Helper_optional,RHINO,rhino) \
101100
$(call gb_Helper_optional,SKIA,skia) \
102-
$(call gb_Helper_optional,STAROFFICE,libstaroffice) \
103101
$(if $(filter WNT,$(OS)),twain_dsm) \
104102
$(call gb_Helper_optional,VISIO,libvisio) \
105103
$(call gb_Helper_optional,WPD,libwpd) \

‎libreoffice-core/include/comphelper/vecstream.hxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,10 @@ public:
228228
void setRelationshipAccess(std::shared_ptr<comphelper::RelationshipAccessImpl> relAccess)
229229
{
230230
m_relAccess = relAccess;
231-
m_inputStream->setRelationshipAccess(relAccess);
232-
m_outputStream->setRelationshipAccess(relAccess);
231+
if (m_inputStream)
232+
m_inputStream->setRelationshipAccess(relAccess);
233+
if (m_outputStream)
234+
m_outputStream->setRelationshipAccess(relAccess);
233235
}
234236

235237
void setRelationships(css::uno::Sequence<css::uno::Sequence<css::beans::StringPair>> aRelInfo)

‎libreoffice-core/include/oox/helper/expandedstorage.hxx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <memory>
44
#include <sal/types.h>
55
#include <com/sun/star/embed/XExtendedStorageStream.hpp>
6-
#include <boost/unordered/unordered_map_fwd.hpp>
76
#include <com/sun/star/embed/XExtendedStorageStream.hpp>
87
#include <com/sun/star/io/XInputStream.hpp>
98
#include <com/sun/star/io/XSeekable.hpp>
@@ -15,7 +14,6 @@
1514
#include <com/sun/star/uno/Sequence.hxx>
1615
#include <string>
1716
#include <unordered_map>
18-
#include <boost/unordered_map.hpp>
1917
#include <mutex>
2018
#include <com/sun/star/embed/XStorage.hpp>
2119
#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
@@ -26,7 +24,6 @@
2624
#include <cppuhelper/weak.hxx>
2725
#include <comphelper/interfacecontainer4.hxx>
2826
#include <comphelper/relationshipaccess.hxx>
29-
#include <unordered_map>
3027

3128
namespace com::sun::star
3229
{
@@ -75,10 +72,10 @@ struct ExpandedFile
7572
ExpandedFile(const OUString& path_, const std::vector<sal_Int8>&& content_, const ShaVec&& sha_)
7673
: path(path_)
7774
, sha(std::make_shared<ShaVec>(std::move(sha_)))
78-
, content(std::make_shared<std::vector<sal_Int8>>(std::move(content_))) {};
75+
, content(std::make_shared<std::vector<sal_Int8>>(std::move(content_))){};
7976
};
8077

81-
typedef boost::unordered_map<std::string, ExpandedFile> ExpandedFileMap;
78+
typedef std::unordered_map<std::string, ExpandedFile> ExpandedFileMap;
8279
enum PathType
8380
{
8481
Relative,
@@ -107,7 +104,7 @@ class ExpandedStorage final : public css::lang::XTypeProvider,
107104
{
108105
std::shared_ptr<comphelper::RelationshipAccessImpl> m_relAccess;
109106
std::shared_ptr<
110-
boost::unordered_map<std::string, std::shared_ptr<comphelper::RelationshipAccessImpl>>>
107+
std::unordered_map<std::string, std::shared_ptr<comphelper::RelationshipAccessImpl>>>
111108
m_allRelAccessMap;
112109
std::shared_ptr<ExpandedFileMap> m_files;
113110
std::shared_ptr<Commit> m_lastCommit;
@@ -128,7 +125,7 @@ public:
128125
const std::shared_ptr<ExpandedFileMap>& fileMap,
129126
const css::uno::Reference<io::XInputStream>& rxInputStream, const OUString& basePath,
130127
std::shared_ptr<
131-
boost::unordered_map<std::string, std::shared_ptr<comphelper::RelationshipAccessImpl>>>
128+
std::unordered_map<std::string, std::shared_ptr<comphelper::RelationshipAccessImpl>>>
132129
allRelAccessMap,
133130
std::shared_ptr<Commit> lastCommit);
134131

0 commit comments

Comments
 (0)