From 551d340dcdc71c2fada0d010d3be4fb6afd580b0 Mon Sep 17 00:00:00 2001
From: "davidmc%netscape.com"
 <davidmc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 19 Apr 1999 22:21:46 +0000
Subject: [PATCH] morkRow::CellAt(): check for negative mork_pos index
 morkRow::Set(): call morkAtom::AddCellUse() in both if branches

git-svn-id: svn://10.0.0.236/trunk@28122 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/db/mork/src/morkRow.cpp          | 10 +++++++---
 mozilla/mailnews/db/mork/src/morkRow.cpp | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mozilla/db/mork/src/morkRow.cpp b/mozilla/db/mork/src/morkRow.cpp
index 1fa7ea31900..47fe74ea58d 100644
--- a/mozilla/db/mork/src/morkRow.cpp
+++ b/mozilla/db/mork/src/morkRow.cpp
@@ -205,7 +205,8 @@ morkRow::AcquireCellHandle(morkEnv* ev, morkCell* ioCell,
     cellObj->CutStrongRef(ev);
     return cellHandle;
   }
-  return (nsIMdbCell*) 0;}
+  return (nsIMdbCell*) 0;
+}
 
 mork_count
 morkRow::CountOverlap(morkEnv* ev, morkCell* ioVector, mork_fill inFill)
@@ -344,7 +345,7 @@ morkCell*
 morkRow::CellAt(morkEnv* ev, mork_pos inPos) const
 {
   morkCell* cells = mRow_Cells;
-  if ( cells && inPos < mRow_Length )
+  if ( cells && inPos < mRow_Length && inPos >= 0 )
   {
     return cells + inPos;
   }
@@ -445,7 +446,10 @@ morkRow::SetRow(morkEnv* ev, const morkRow* inSourceRow)
             if ( dstCol )
             {
               dst->SetColumnAndChange(dstCol, morkChange_kAdd);
-              dst->mCell_Atom = store->CopyAtom(ev, atom);
+              atom = store->CopyAtom(ev, atom);
+              dst->mCell_Atom = atom;
+              if ( atom ) // another ref?
+                atom->AddCellUse(ev);
             }
           }
         }
diff --git a/mozilla/mailnews/db/mork/src/morkRow.cpp b/mozilla/mailnews/db/mork/src/morkRow.cpp
index 1fa7ea31900..47fe74ea58d 100644
--- a/mozilla/mailnews/db/mork/src/morkRow.cpp
+++ b/mozilla/mailnews/db/mork/src/morkRow.cpp
@@ -205,7 +205,8 @@ morkRow::AcquireCellHandle(morkEnv* ev, morkCell* ioCell,
     cellObj->CutStrongRef(ev);
     return cellHandle;
   }
-  return (nsIMdbCell*) 0;}
+  return (nsIMdbCell*) 0;
+}
 
 mork_count
 morkRow::CountOverlap(morkEnv* ev, morkCell* ioVector, mork_fill inFill)
@@ -344,7 +345,7 @@ morkCell*
 morkRow::CellAt(morkEnv* ev, mork_pos inPos) const
 {
   morkCell* cells = mRow_Cells;
-  if ( cells && inPos < mRow_Length )
+  if ( cells && inPos < mRow_Length && inPos >= 0 )
   {
     return cells + inPos;
   }
@@ -445,7 +446,10 @@ morkRow::SetRow(morkEnv* ev, const morkRow* inSourceRow)
             if ( dstCol )
             {
               dst->SetColumnAndChange(dstCol, morkChange_kAdd);
-              dst->mCell_Atom = store->CopyAtom(ev, atom);
+              atom = store->CopyAtom(ev, atom);
+              dst->mCell_Atom = atom;
+              if ( atom ) // another ref?
+                atom->AddCellUse(ev);
             }
           }
         }