Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard against invalid color ref

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-01-19 14:06:36 +00:00
parent d7872f625f
commit 405f35e560
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osx/core/colour.cpp
View File

@@ -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) } ; CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ;
col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
} }
wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
m_cgColour.reset( col ); m_cgColour.reset( col );
} }
@@ -101,12 +102,14 @@ void wxColour::InitRGBColor( const RGBColor& col )
(CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ; (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;
cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
} }
wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
m_cgColour.reset( cfcol ); m_cgColour.reset( cfcol );
} }
#endif #endif
void wxColour::InitCGColorRef( CGColorRef col ) void wxColour::InitCGColorRef( CGColorRef col )
{ {
wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
m_cgColour.reset( col ); m_cgColour.reset( col );
size_t noComp = CGColorGetNumberOfComponents( col ); size_t noComp = CGColorGetNumberOfComponents( col );