diff options
| author | Neil <nyamatongwe@gmail.com> | 2013-07-08 21:27:54 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2013-07-08 21:27:54 +1000 |
| commit | 0b381c1827ba50c81a81a1ed4a3a7400bfcbb12a (patch) | |
| tree | 05ff3b6fb23175a74a9a5a0f9a30f39c54d30dd1 | |
| parent | 98968508cec9326e493c748b9c042b9fa1c1f47d (diff) | |
| download | scintilla-mirror-0b381c1827ba50c81a81a1ed4a3a7400bfcbb12a.tar.gz | |
Bug: [#1494]. Avoid crash if SC_MARK_PIXMAP used without a pixmap.
| -rw-r--r-- | src/ViewStyle.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |