[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/document.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 3cf9916a38975ea7f9a815b35de47ee1b82fa919
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri May 9 11:44:51 2014 -0400

    fdo#77806: Check the boundaries before accessing an array....
    
    Change-Id: I0878f734599f566cde83183947cd7613c0f8d5c6
    (cherry picked from commit a45973a90625f4b9e0f603154194f357ff2418d4)
    Reviewed-on: https://gerrit.libreoffice.org/9292
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8c69412..47164be 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6113,14 +6113,30 @@ bool ScDocument::HasNote(const ScAddress& rPos) const
 {
     return HasNote(rPos.Col(), rPos.Row(), rPos.Tab());
 }
+
 bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab) const
 {
-    const ScPostIt* pNote = maTabs[nTab]->aCol[nCol].GetCellNote(nRow);
+    if (!ValidColRow(nCol, nRow))
+        return false;
+
+    const ScTable* pTab = FetchTable(nTab);
+    if (!pTab)
+        return false;
+
+    const ScPostIt* pNote = pTab->aCol[nCol].GetCellNote(nRow);
     return pNote != NULL;
 }
+
 bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab) const
 {
-    return maTabs[nTab]->aCol[nCol].HasCellNotes();
+    if (!ValidCol(nCol))
+        return false;
+
+    const ScTable* pTab = FetchTable(nTab);
+    if (!pTab)
+        return false;
+
+    return pTab->aCol[nCol].HasCellNotes();
 }
 
 bool ScDocument::HasTabNotes(SCTAB nTab) const