Patches from long ago: Make pango_layout slightly more robust. Do

Patches from long ago:
* pango/pango-layout.c: Make pango_layout slightly more robust.
Do check_lines before getting cursor position.

1 files changed, 7 insertions, 1 deletions

diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 0b928a24..3d6594b4 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -808,6 +808,7 @@ PangoLayoutLine *
 pango_layout_get_line (PangoLayout *layout,
 		       int          line)
 {
+  GSList *list_item;
   g_return_val_if_fail (layout != NULL, NULL);
   g_return_val_if_fail (line >= 0, NULL);
 
@@ -815,7 +816,10 @@ pango_layout_get_line (PangoLayout *layout,
     return NULL;
 
   pango_layout_check_lines (layout);
-  return g_slist_nth (layout->lines, line)->data;
+  list_item = g_slist_nth (layout->lines, line);
+  if(list_item)
+    return list_item->data;
+  return NULL;
 }
 
 /**
@@ -1411,6 +1415,8 @@ pango_layout_get_cursor_pos (PangoLayout    *layout,
   
   base_dir = pango_context_get_base_dir (layout->context);
 
+  pango_layout_check_lines (layout);
+
   iter = pango_layout_get_iter (layout);
   
   /* Find the line */