Added null checks to wxTextObjectData::GetDataHere and GetDataSize [ patch 1237326 ]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index a37ffa50e625d0deeb42b22c3bd3e407270d85c3..ff161cddf30d4de9062cdb7fd18e0c8dc05cc277 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -287,7 +287,8 @@ size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
     else  // == wxDF_TEXT
     {
         wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
     else  // == wxDF_TEXT
     {
         wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );

-        return strlen( (const char*) buffer ) + 1;
+        // in some cases "buffer" is null (e.g. Mac OS X)
+        return buffer ? strlen( (const char*) buffer ) + 1 : 0;

     }
 }
 
     }
 }
 


@@ -304,7 +305,9 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
     else
     {
         wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
     else
     {
         wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );

-        strcpy( (char*) buf, (const char*) buffer );
+        // in some cases "buffer" is null (e.g. Mac OS X)
+        if (buffer)
+            strcpy( (char*) buf, (const char*) buffer );

     }
 
     return true;
     }
 
     return true;