From 405f35e560f412cc72a955ca3dbdc8b261014b99 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 19 Jan 2012 14:06:36 +0000 Subject: [PATCH] guard against invalid color ref git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/core/colour.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index c30e8bdc6f..cb148d9db4 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -79,6 +79,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ; col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; } + wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color"); m_cgColour.reset( col ); } @@ -101,12 +102,14 @@ void wxColour::InitRGBColor( const RGBColor& col ) (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ; cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; } + wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color"); m_cgColour.reset( cfcol ); } #endif void wxColour::InitCGColorRef( CGColorRef col ) { + wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color"); m_cgColour.reset( col ); size_t noComp = CGColorGetNumberOfComponents( col ); -- 2.45.2