[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - formula/source
Eike Rathke
erack at redhat.com
Thu Dec 17 08:06:18 PST 2015
formula/source/ui/dlg/parawin.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aed57fec1530b4f377f8105b167ab9343c22bc37
Author: Eike Rathke <erack at redhat.com>
Date: Thu Dec 17 15:41:31 2015 +0100
out-of-bounds arg mapping access, this was always wrong but never hit it seems
Change-Id: I15843b320ac8ddcefce8094da7aa7c6b81b42e4f
(cherry picked from commit 5b404cc2adcea04938c8159c0bc84a8cd44ec5df)
Reviewed-on: https://gerrit.libreoffice.org/20773
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index f990dea..b73ac6a 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -118,7 +118,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
if ( nArgs < VAR_ARGS )
{
- sal_uInt16 nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg;
+ sal_uInt16 nRealArg = (nArg < aVisibleArgMapping.size()) ? aVisibleArgMapping[nArg] : nArg;
aArgDesc = pFuncDesc->getParameterDescription(nRealArg);
aArgName = pFuncDesc->getParameterName(nRealArg);
aArgName += " ";
More information about the Libreoffice-commits
mailing list