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

Fix crash in wxGraphicsPen::CreatePen() after wxPenInfo changes

Browse Source 
Don't unconditionally dereference the result of wxPen::GetStipple()
which can (and often is) null.

This fixes crash introduced in 40f8403f5d.
This commit is contained in:
Vadim Zeitlin
2017-09-13 14:02:45 +02:00
parent 85ea9c180d
commit d25d2400fc
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/graphcmn.cpp
View File

@@ -828,17 +828,22 @@ wxGraphicsPen wxGraphicsContext::CreatePen(const wxPen& pen) const
if ( !pen.IsOk() ) if ( !pen.IsOk() )
return wxGraphicsPen(); return wxGraphicsPen();
wxDash *dashes; wxGraphicsPenInfo info = wxGraphicsPenInfo()
int nb_dashes = pen.GetDashes(&dashes); .Colour(pen.GetColour())
.Width(pen.GetWidth())
.Style(pen.GetStyle())
.Join(pen.GetJoin())
.Cap(pen.GetCap())
;
return DoCreatePen(wxGraphicsPenInfo() wxDash *dashes;
.Colour(pen.GetColour()) if ( int nb_dashes = pen.GetDashes(&dashes) )
.Width(pen.GetWidth()) info.Dashes(nb_dashes, dashes);
.Style(pen.GetStyle())
.Stipple(*pen.GetStipple()) if ( wxBitmap* const stipple = pen.GetStipple() )
.Dashes(nb_dashes, dashes) info.Stipple(*stipple);
.Join(pen.GetJoin())
.Cap(pen.GetCap())); return DoCreatePen(info);
} }
wxGraphicsPen wxGraphicsContext::DoCreatePen(const wxGraphicsPenInfo& info) const wxGraphicsPen wxGraphicsContext::DoCreatePen(const wxGraphicsPenInfo& info) const