diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-12 20:49:52 +0000 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-11-13 10:59:03 +0100 |
| commit | 647202e25c0ebd145f690a8f0d8269501c85944e (patch) | |
| tree | 33646d14fc5b15e8ec7792d5856dd3a265082e5b /external | |
| parent | 23d8c2b148f88575a9c971602d3a1bc71dabf0b1 (diff) | |
CVE-2019-16707
Change-Id: I69c4c31330fde135b6ff6c0c1c72f613f0cc4b1d
Reviewed-on: https://gerrit.libreoffice.org/82552
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/hunspell/0001-invalid-read-memory-access-624.patch | 25 | ||||
| -rw-r--r-- | external/hunspell/UnpackedTarball_hunspell.mk | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/external/hunspell/0001-invalid-read-memory-access-624.patch b/external/hunspell/0001-invalid-read-memory-access-624.patch new file mode 100644 index 000000000000..66b55e7555bd --- /dev/null +++ b/external/hunspell/0001-invalid-read-memory-access-624.patch @@ -0,0 +1,25 @@ +From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Tue, 12 Nov 2019 20:03:15 +0000 +Subject: [PATCH] invalid read memory access #624 + +--- + src/hunspell/suggestmgr.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx +index dba084e..c23f165 100644 +--- a/src/hunspell/suggestmgr.cxx ++++ b/src/hunspell/suggestmgr.cxx +@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( + int l2 = su2.size(); + // decapitalize dictionary word + if (complexprefixes) { +- if (su1[l1 - 1] == su2[l2 - 1]) ++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) + return 1; + } else { + unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; +-- +2.23.0 + diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 37a2d196fbf5..1cd24e225868 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -22,6 +22,7 @@ endif $(eval $(call gb_UnpackedTarball_set_patchlevel,hunspell,1)) $(eval $(call gb_UnpackedTarball_add_patches,hunspell, \ + external/hunspell/0001-invalid-read-memory-access-624.patch \ )) # vim: set noet sw=4 ts=4: |