[PATCH] SdrEscherImport::RecolorGraphic reads but doesn't use FillColors
authorCaolán McNamara <caolan.mcnamara@collabora.com>
Sun, 26 Apr 2026 15:49:32 +0000 (15:49 +0000)
committerRene Engelhard <rene@debian.org>
Sat, 6 Jun 2026 20:12:08 +0000 (22:12 +0200)
it never did, but at:

commit 025bfa7e510bdab3ef93ad45a731fc25085ba3cc
Date:   Thu Apr 23 10:03:58 2015 +0100

    cppcheck: unreadVariable

the wrong choice was made wrt the dead store, the dead loop should have
been fixed rather than let the unused fill colors accumulate in the
globalcolors buffer.

This function doesn't need to consume the unused data, all callers don't
expect the entire record to be read so just drop the loop.

Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I02bce4dd78dc566f18edc3d45603534c3f724cc3
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/1689
(cherry picked from commit 07faeadace3d8d93225f9dd72c4f911e331070e2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205089
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 9ba100c0d2131862c9356a86906921abc80d8f98)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205097

Gbp-Pq: Name CVE-2026-8356.diff

filter/source/msfilter/svdfppt.cxx

index 20d3e5d9bc96d14ebd034f13efea452e1ae4aa59..51ee66f36e0f25bd228e53905b13216e603ff97b 100644 (file)
Binary files a/filter/source/msfilter/svdfppt.cxx and b/filter/source/msfilter/svdfppt.cxx differ