Add some asserts to ensure cols and rows are >= 0 to avoid crashes

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 8c1309a9df952f079f430eed5cfcd299cec87b10..26a9a6785a3d64326bf88a09d041a4a915acd85b 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -87,7 +87,7 @@ wxColourData::~wxColourData()
 
 void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {
-    wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, _T("custom colour index out of range") );
+    wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, wxT("custom colour index out of range") );
 
     m_custColours[i] = colour;
 }
@@ -95,7 +95,7 @@ void wxColourData::SetCustomColour(int i, const wxColour& colour)
 wxColour wxColourData::GetCustomColour(int i) const
 {
     wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
-                 _T("custom colour index out of range") );
+                 wxT("custom colour index out of range") );
 
     return m_custColours[i];
 }
@@ -223,11 +223,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
 
 void wxPrintData::SetPrivData( char *privData, int len )
 {
-    if (m_privData)
-    {
-        delete [] m_privData;
-        m_privData = NULL;
-    }
+    wxDELETEA(m_privData);
     m_privDataLen = len;
     if (m_privDataLen > 0)
     {
@@ -256,8 +252,11 @@ void wxPrintData::ConvertFromNative()
     m_nativeData->TransferTo( *this ) ;
 }
 
-void wxPrintData::operator=(const wxPrintData& data)
+wxPrintData& wxPrintData::operator=(const wxPrintData& data)
 {
+    if ( &data == this )
+        return *this;
+
     m_printNoCopies = data.m_printNoCopies;
     m_printCollate = data.m_printCollate;
     m_printOrientation = data.m_printOrientation;
@@ -284,17 +283,15 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;
 
-    if (m_privData)
-    {
-        delete [] m_privData;
-        m_privData = NULL;
-    }
+    wxDELETEA(m_privData);
     m_privDataLen = data.GetPrivDataLen();
     if (m_privDataLen > 0)
     {
         m_privData = new char[m_privDataLen];
         memcpy( m_privData, data.GetPrivData(), m_privDataLen );
     }
+
+    return *this;
 }
 
 // Is this data OK for showing the print dialog?
@@ -499,7 +496,7 @@ void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+    wxASSERT_MSG( (wxThePrintPaperDatabase != NULL),
                   wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = GetPaperSize();
@@ -514,14 +511,17 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 // Use paper id in wxPrintData to set this object's paper size
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+    wxASSERT_MSG( (wxThePrintPaperDatabase != NULL),
                   wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
-    // sz is in 10ths of a mm, while paper size is in mm
-    m_paperSize.x = sz.x / 10;
-    m_paperSize.y = sz.y / 10;
+    if (sz != wxSize(0, 0))
+    {
+        // sz is in 10ths of a mm, while paper size is in mm
+        m_paperSize.x = sz.x / 10;
+        m_paperSize.y = sz.y / 10;
+    }
 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE