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 | 4b3939b615a3071cb1c62865c69e97260437d9e7 (patch) | |
| tree | 8b0ba104e33317c5c71162b6b068b50d3b458a80 | |
| parent | f701d6f48d8671307a7c74b7d8a008abed9c47bb (diff) | |
| download | scintilla-mirror-4b3939b615a3071cb1c62865c69e97260437d9e7.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; } |