AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "pango: Handle case where pango_layout_get_text() returns NULL"

Browse Source 
This reverts commit 70ac2b24c3.

It turns out the correct fix is to make pango_layout_get_text() not
return NULL. This has been done, so we can drop this patch.

I won't bump the Pango dependency in configure.ac for this as I don't
consider the crash critical enough.
This commit is contained in:
Benjamin Otte 2013-09-09 17:19:28 +02:00
parent 70ac2b24c3
commit 6d344b2c6b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkpango.c
View File

@ -1014,7 +1014,7 @@ _gtk_pango_get_text_before (PangoLayout *layout,
text = pango_layout_get_text (layout);
if (text == NULL || text[0] == 0)
if (text[0] == 0)
{
*start_offset = 0;
*end_offset = 0;
@ -1115,7 +1115,7 @@ _gtk_pango_get_text_after (PangoLayout *layout,
text = pango_layout_get_text (layout);
if (text == NULL || text[0] == 0)
if (text[0] == 0)
{
*start_offset = 0;
*end_offset = 0;
@ -1222,7 +1222,7 @@ _gtk_pango_get_text_at (PangoLayout *layout,
text = pango_layout_get_text (layout);
if (text == NULL || text[0] == 0)
if (text[0] == 0)
{
*start_offset = 0;
*end_offset = 0;