mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fail Executable_ulfex upon duplicate keys in malformed input

Browse Source 
...instead of causing use-after-free of pMergeEntrys, which would be destroyed
during the (non-adding) emplace call but would still be used in the following
if/else block (see the commit message of
c6e2052b6f0d281fed334f8c803b1a6486d5b3bc "Update git submodules: Fix duplicate
key typo")

Change-Id: Iac8d67e61aba0144d3d5807f478c7b330d7c4c81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130235
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2022-02-21 08:09:49 +01:00
parent 846f483dca
commit 56c4445a80
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
l10ntools/source/merge.cxx
View File

@ -21,7 +21,9 @@
#include <sal/log.hxx> #include <sal/log.hxx>
#include <algorithm> #include <algorithm>
#include <cstdlib>
#include <fstream> #include <fstream>
#include <iostream>
#include <string> #include <string>
#include <vector> #include <vector>
@ -298,7 +300,11 @@ void MergeDataFile::InsertEntry(
if( !pMergeEntrys ) if( !pMergeEntrys )
{ {
pMergeEntrys = new MergeEntrys; pMergeEntrys = new MergeEntrys;
aMap.emplace( sKey, std::unique_ptr<MergeEntrys>(pMergeEntrys) ); if (!aMap.emplace( sKey, std::unique_ptr<MergeEntrys>(pMergeEntrys) ).second)
{
std::cerr << "Duplicate entry " << sKey << "\n";
std::exit(EXIT_FAILURE);
}
} }