From 2305ff869ebf629dc1f5913d3c0b46cb6d9efb08 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 13 May 2006 18:51:21 +0000 Subject: Don't copy item before g_return_if_fail'ing it for NULL. (Coverity issue 2006-05-13 Behdad Esfahbod * pango/pango-item.c (pango_item_split): Don't copy item before g_return_if_fail'ing it for NULL. (Coverity issue id=18509&runid=43) --- ChangeLog | 7 ++++++- pango/pango-item.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56937344..ad730821 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2006-05-13 Behdad Esfahbod + + * pango/pango-item.c (pango_item_split): Don't copy item before + g_return_if_fail'ing it for NULL. (Coverity issue id=18509&runid=43) + 2006-05-13 Behdad Esfahbod * pango/fonts.c (pango_font_face_list_sizes): Fix possible NULL - dereference. (Coverity found) + dereference. (Coverity issues id=17770&runid=43) 2006-05-11 Behdad Esfahbod diff --git a/pango/pango-item.c b/pango/pango-item.c index 37622e87..54d0f52e 100644 --- a/pango/pango-item.c +++ b/pango/pango-item.c @@ -134,7 +134,7 @@ pango_item_split (PangoItem *orig, int split_index, int split_offset) { - PangoItem *new_item = pango_item_copy (orig); + PangoItem *new_item; g_return_val_if_fail (orig != NULL, NULL); g_return_val_if_fail (orig->length > 0, NULL); @@ -143,6 +143,7 @@ pango_item_split (PangoItem *orig, g_return_val_if_fail (split_offset > 0, NULL); g_return_val_if_fail (split_offset < orig->num_chars, NULL); + new_item = pango_item_copy (orig); new_item->length = split_index; new_item->num_chars = split_offset; -- cgit v1.2.1