[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

Markus Mohrhard markus.mohrhard at googlemail.com
Tue Apr 10 08:47:48 UTC 2018


 sw/source/ui/frmdlg/frmpage.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d3444ffe5b0ec37ad99d6969179184abea21385
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 8 12:43:13 2018 +0200

    fix global-buffer-overflow found through UI testing on UBSAN jenkins job
    
    Change-Id: Ie4d81561057bb4d67fe050ca7fb82861d5d207a2
    Reviewed-on: https://gerrit.libreoffice.org/52587
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit c442ac8c20cfceb8c87e96c494dcd8372dc6e206)
    Reviewed-on: https://gerrit.libreoffice.org/52609
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index d2ab2ce96c8d..a69f8c59d6d8 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -782,7 +782,7 @@ void SwFramePage::setOptimalFrameWidth()
         { aHFrameMap, SAL_N_ELEMENTS(aHFrameMap) },
         { aHFlyHtmlMap, SAL_N_ELEMENTS(aHFlyHtmlMap) },
         { aVFrameMap, SAL_N_ELEMENTS(aVFrameMap) },
-        { aVFlyHtmlMap, SAL_N_ELEMENTS(aVFrameMap) },
+        { aVFlyHtmlMap, SAL_N_ELEMENTS(aVFlyHtmlMap) },
         { aHParaMap, SAL_N_ELEMENTS(aHParaMap) },
         { aHParaHtmlMap, SAL_N_ELEMENTS(aHParaHtmlMap) },
         { aHParaHtmlAbsMap, SAL_N_ELEMENTS(aHParaHtmlAbsMap) },


More information about the Libreoffice-commits mailing list