1. fixed file descriptors leak in wxFileName::CreateTempFileName()
2. really made it race-safe (provided we have mkstemp()) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -478,7 +478,7 @@ bool wxTempFile::Open(const wxString& strName)
|
||||
{
|
||||
m_strName = strName;
|
||||
|
||||
m_strTemp = wxFileName::CreateTempFileName(strName);
|
||||
m_strTemp = wxFileName::CreateTempFileName(strName, &m_file);
|
||||
|
||||
if ( m_strTemp.empty() )
|
||||
{
|
||||
@@ -486,13 +486,6 @@ bool wxTempFile::Open(const wxString& strName)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// actually open the file now (it must already exist)
|
||||
if ( !m_file.Open(m_strTemp, wxFile::write) )
|
||||
{
|
||||
// opening existing file failed?
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef __UNIX__
|
||||
// the temp file should have the same permissions as the original one
|
||||
mode_t mode;
|
||||
|
Reference in New Issue
Block a user