CID#736203 out of bounds access

Change-Id: I4db4e241b6b2348a48536a7dd0f1aecbf04cb675

CID#736203 out of bounds access
Change-Id: I4db4e241b6b2348a48536a7dd0f1aecbf04cb675
b40d092b · Caolán McNamara · 49325659 · b40d092b
Kaydet (Commit) b40d092b authored Eki 09, 2013 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

ndtxt.cxx sw/source/core/txtnode/ndtxt.cxx +9 -1

No files found.
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2651,7 +2651,15 @@ sal_Bool SwTxtNode::HasNumber() const
    const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
    if ( pRule )
    {
-        SwNumFmt aFmt(pRule->Get( static_cast<sal_uInt16>(GetActualListLevel())));
+        int nLevel = GetActualListLevel();
+
+        if (nLevel < 0)
+            nLevel = 0;
+
+        if (nLevel >= MAXLEVEL)
+            nLevel = MAXLEVEL - 1;
+
+        SwNumFmt aFmt(pRule->Get(static_cast<sal_uInt16>(nLevel)));

        // #i40041#
        bResult = aFmt.IsEnumeration() &&