From 26f28df18a2ff3069f89045fea0973cf5ed892ca Mon Sep 17 00:00:00 2001 From: Yang Gu Date: Tue, 16 Mar 2010 18:01:38 +0800 Subject: [PATCH] Handle the conversion failure when parsing item --- src/stkutil.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/stkutil.c b/src/stkutil.c index 787f7eb..ceba2d5 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -190,6 +190,7 @@ static gboolean parse_dataobj_item(struct comprehension_tlv_iter *iter, struct stk_item *item = user; const unsigned char *data; unsigned int len; + char *utf8; if (comprehension_tlv_iter_get_tag(iter) != STK_DATA_OBJECT_TYPE_ITEM) @@ -206,7 +207,12 @@ static gboolean parse_dataobj_item(struct comprehension_tlv_iter *iter, return FALSE; item->id = data[0]; - item->text = sim_string_to_utf8(data+1, len-1); + utf8 = sim_string_to_utf8(data+1, len-1); + + if (utf8 == NULL) + return FALSE; + + item->text = utf8; return TRUE; } -- 2.7.4