From 78b763db4dfd611aa5c30e78a2020f5f46f08fa5 Mon Sep 17 00:00:00 2001
From: "bienvenu%netscape.com"
 <bienvenu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 15 Oct 1999 03:50:21 +0000
Subject: [PATCH] more of addrbook memory leak fixes r=mscott

git-svn-id: svn://10.0.0.236/trunk@50774 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/addrbook/src/nsAddrDatabase.cpp  | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp
index 313c8be23ec..5d4f3bf89c8 100644
--- a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -613,30 +613,8 @@ NS_IMETHODIMP nsAddrDatabase::OpenMDB(nsFileSpec *dbName, PRBool create)
 				mdbOpenPolicy inOpenPolicy;
 				mdb_bool	canOpen;
 				mdbYarn		outFormatVersion;
-				// char		bufFirst512Bytes[512];
-				// mdbYarn		first512Bytes;
-
-				// first512Bytes.mYarn_Buf = bufFirst512Bytes;
-				// first512Bytes.mYarn_Size = 512;
-				// first512Bytes.mYarn_Fill = 512;
-				// first512Bytes.mYarn_Form = 0;	// what to do with this? we're storing csid in the msg hdr...
-
-				// {
-				// 	nsFileSpec ioStream(dbName->GetCString());
-				// 	nsIOFileStream *dbStream = new nsIOFileStream(ioStream);
-				// 	if (dbStream) {
-				// 		PRInt32 bytesRead = dbStream->read(bufFirst512Bytes, sizeof(bufFirst512Bytes));
-				// 		first512Bytes.mYarn_Fill = bytesRead;
-				// 		dbStream->close();
-				// 		delete dbStream;
-				// 	}
-				// 	else {
-				// 		PR_FREEIF(nativeFileName);
-				// 		return NS_ERROR_OUT_OF_MEMORY;
-				// 	}
-				// }
-				
 				nsIMdbFile* oldFile = 0;
+
 				ret = myMDBFactory->OpenOldFile(m_mdbEnv, dbHeap, nativeFileName,
 					 dbFrozen, &oldFile);
 				if ( oldFile )
@@ -711,6 +689,10 @@ NS_IMETHODIMP nsAddrDatabase::OpenMDB(nsFileSpec *dbName, PRBool create)
 					newFile->CutStrongRef(m_mdbEnv); // always release our file ref, store has own
 				}
 			}
+			if(thumb)
+			{
+				thumb->CutStrongRef(m_mdbEnv);
+			}
 		}
 	}
 	return ret;