Fix assertion failure on some systems when an INDIC_SQUIGGLEPIXMAP drawn for a

zero-width character.

2 files changed, 6 insertions, 0 deletions

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 069a2cf5c..975dc8d04 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -595,6 +595,10 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/2401/">Bug #2401</a>.
 	</li>
 	<li>
+	For GTK, fix assertion failure on some systems when an INDIC_SQUIGGLEPIXMAP drawn
+	for a zero-width character.
+	</li>
+	<li>
 	For Qt, allow parent window to handle context menu events by setting as ignored.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2395/">Bug #2395</a>.
 	</li>
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index b9e63c8ab..692735f45 100755
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -607,6 +607,8 @@ void SurfaceImpl::GradientRectangle(PRectangle rc, const std::vector<ColourStop>
 
 void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
 	PLATFORM_ASSERT(context);
+	if (width == 0)
+		return;
 	if (rc.Width() > width)
 		rc.left += (rc.Width() - width) / 2;
 	rc.right = rc.left + width;