X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53c75dc2f27fb1679f47a4a297f36d5066d354da..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/buffer.h?ds=inline diff --git a/include/wx/buffer.h b/include/wx/buffer.h index 81a445afe5..346ef113f9 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -15,7 +15,9 @@ #include "wx/chartype.h" #include "wx/wxcrtbase.h" +#ifndef __WXPALMOS5__ #include // malloc() and free() +#endif // ! __WXPALMOS5__ class WXDLLIMPEXP_FWD_BASE wxCStrData; @@ -105,9 +107,12 @@ public: wxCharTypeBuffer& operator=(const wxCharTypeBuffer& src) { - if ( m_owned ) - free(m_str); - CopyFrom(src); + if (&src != this) + { + if ( m_owned ) + free(m_str); + CopyFrom(src); + } return *this; } @@ -317,9 +322,12 @@ public: wxMemoryBuffer& operator=(const wxMemoryBuffer& src) { - m_bufdata->DecRef(); - m_bufdata = src.m_bufdata; - m_bufdata->IncRef(); + if (&src != this) + { + m_bufdata->DecRef(); + m_bufdata = src.m_bufdata; + m_bufdata->IncRef(); + } return *this; }