From 0b381c1827ba50c81a81a1ed4a3a7400bfcbb12a Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 8 Jul 2013 21:27:54 +1000 Subject: Bug: [#1494]. Avoid crash if SC_MARK_PIXMAP used without a pixmap. --- src/ViewStyle.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index fad487e6b..8d2a60e14 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -398,11 +398,11 @@ void ViewStyle::CalcLargestMarkerHeight() { for (int m = 0; m <= MARKER_MAX; ++m) { switch (markers[m].markType) { case SC_MARK_PIXMAP: - if (markers[m].pxpm->GetHeight() > largestMarkerHeight) + if (markers[m].pxpm && markers[m].pxpm->GetHeight() > largestMarkerHeight) largestMarkerHeight = markers[m].pxpm->GetHeight(); break; case SC_MARK_RGBAIMAGE: - if (markers[m].image->GetHeight() > largestMarkerHeight) + if (markers[m].image && markers[m].image->GetHeight() > largestMarkerHeight) largestMarkerHeight = markers[m].image->GetHeight(); break; } -- cgit v1.2.3