AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow passing NULL buffer to wx{,F}File::{Read,Write} when count==0.

Browse Source 
If the count of bytes to read or write is 0, the buffer pointer value
shouldn't matter as it's not used at all anyhow, so relax the assert and allow
it to be NULL in this case.

Closes #16018.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-02-27 15:46:36 +00:00
parent d5216a4afc
commit ae4b084e77
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/ffile.cpp
View File

@ -125,6 +125,9 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
size_t wxFFile::Read(void *pBuf, size_t nCount)
{
if ( !nCount )
return 0;
wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
wxCHECK_MSG( IsOpened(), 0, wxT("can't read from closed file") );
@ -139,6 +142,9 @@ size_t wxFFile::Read(void *pBuf, size_t nCount)
size_t wxFFile::Write(const void *pBuf, size_t nCount)
{
if ( !nCount )
return 0;
wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
wxCHECK_MSG( IsOpened(), 0, wxT("can't write to closed file") );

6
src/common/file.cpp
View File

@ -325,6 +325,9 @@ bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
// read
ssize_t wxFile::Read(void *pBuf, size_t nCount)
{
if ( !nCount )
return 0;
wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
ssize_t iRc = wxRead(m_fd, pBuf, nCount);
@ -341,6 +344,9 @@ ssize_t wxFile::Read(void *pBuf, size_t nCount)
// write
size_t wxFile::Write(const void *pBuf, size_t nCount)
{
if ( !nCount )
return 0;
wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
ssize_t iRc = wxWrite(m_fd, pBuf, nCount);