From 8204b2758cacfc4114050cdb19c69d1f8885c286 Mon Sep 17 00:00:00 2001
From: "dwitte%stanford.edu"
 <dwitte%stanford.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Jun 2007 04:58:52 +0000
Subject: [PATCH] check for non-null connection in mozStorageTransaction
 helper. b=384224, r=sspitzer

git-svn-id: svn://10.0.0.236/trunk@228032 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/storage/public/mozStorageHelper.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mozilla/storage/public/mozStorageHelper.h b/mozilla/storage/public/mozStorageHelper.h
index ab2e92cf525..a7fa47bce5f 100644
--- a/mozilla/storage/public/mozStorageHelper.h
+++ b/mozilla/storage/public/mozStorageHelper.h
@@ -64,18 +64,21 @@ public:
                         PRBool aCommitOnComplete,
                         PRInt32 aType = mozIStorageConnection::TRANSACTION_DEFERRED)
     : mConnection(aConnection),
+      mHasTransaction(PR_FALSE),
       mCommitOnComplete(aCommitOnComplete),
       mCompleted(PR_FALSE)
   {
-    PRBool transactionInProgress = PR_FALSE;
-    mConnection->GetTransactionInProgress(&transactionInProgress);
-    mHasTransaction = ! transactionInProgress;
-    if (mHasTransaction)
-      mConnection->BeginTransactionAs(aType);
+    if (mConnection) {
+      PRBool transactionInProgress = PR_FALSE;
+      mConnection->GetTransactionInProgress(&transactionInProgress);
+      mHasTransaction = ! transactionInProgress;
+      if (mHasTransaction)
+        mConnection->BeginTransactionAs(aType);
+    }
   }
   ~mozStorageTransaction()
   {
-    if (mHasTransaction && ! mCompleted) {
+    if (mConnection && mHasTransaction && ! mCompleted) {
       if (mCommitOnComplete)
         mConnection->CommitTransaction();
       else
@@ -90,8 +93,8 @@ public:
    */
   nsresult Commit()
   {
-    if (mCompleted)
-      return NS_OK; // already done
+    if (!mConnection || mCompleted)
+      return NS_OK; // no connection, or already done
     mCompleted = PR_TRUE;
     if (! mHasTransaction)
       return NS_OK; // transaction not ours, ignore
@@ -105,8 +108,8 @@ public:
    */
   nsresult Rollback()
   {
-    if (mCompleted)
-      return NS_OK; // already done
+    if (!mConnection || mCompleted)
+      return NS_OK; // no connection, or already done
     mCompleted = PR_TRUE;
     if (! mHasTransaction)
       return NS_ERROR_FAILURE;