vcl/source/filter/svm/SvmReader.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
New commits: commit de311257e851f1fdbc87a4df836a526220c668d0 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Jul 11 19:28:25 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Jul 12 10:01:29 2021 +0200 a new MetaTextArrayAction already has a null DXArray Change-Id: I046263745bd5d4cc78eb3c954e42fa32ce057159 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118755 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx index 005417c16809..4d39ef317eba 100644 --- a/vcl/source/filter/svm/SvmReader.cxx +++ b/vcl/source/filter/svm/SvmReader.cxx @@ -699,9 +699,9 @@ rtl::Reference<MetaAction> SvmReader::TextArrayHandler(ImplMetaReadData* pData) if (nTmpLen > aStr.getLength() - nTmpIndex) { pAction->SetIndex(0); - pAction->SetDXArray(nullptr); return pAction; } + if (nAryLen) { // #i9762#, #106172# Ensure that DX array is at least mnLen entries long @@ -724,12 +724,9 @@ rtl::Reference<MetaAction> SvmReader::TextArrayHandler(ImplMetaReadData* pData) } else { - pAction->SetDXArray(nullptr); return pAction; } } - else - pAction->SetDXArray(nullptr); if (aCompat.GetVersion() >= 2) // Version 2 { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
