Fix server crash when nvault is writting to journal file without write permission (bug 3231, r=Arkshine)

Former-commit-id: 6ad9e6bc8cf748bb06d5618cb21741d6e79b0110
2013-07-02 10:20:21 +02:00 · 2013-07-02 10:20:21 +02:00 · 15572e2d61
commit 15572e2d61
parent bf395c8ac1
2 changed files with 10 additions and 3 deletions
--- a/dlls/nvault/Journal.cpp
+++ b/dlls/nvault/Journal.cpp
@ -129,7 +129,9 @@ bool Journal::Begin()

 bool Journal::End()
 {
+	if (m_fp)
 		fclose(m_fp);
+
 	m_Bw.SetFilePtr(NULL);
 	return true;
 }
--- a/dlls/nvault/NVault.cpp
+++ b/dlls/nvault/NVault.cpp
@ -266,8 +266,13 @@ bool NVault::Close()
 		return false;

 	_SaveToFile();
+
+	if (m_Journal) 
+	{
 		m_Journal->End();
 		m_Journal->Erase();
+	}
+
 	m_Open = false;

 	return true;