stkutil: fix crash cause by null text string

According to 3GPP TS 31.124 a zero length for the text string
should be allowed. An empty string must be returned to the
user in this case.
This commit is contained in:
Guillaume Lucas 2010-12-07 10:58:47 +00:00 committed by Denis Kenzior
parent a437bfba54
commit 778302a1e5
1 changed files with 4 additions and 2 deletions

View File

@ -562,7 +562,7 @@ static gboolean parse_dataobj_text(struct comprehension_tlv_iter *iter,
{
char **text = user;
unsigned int len = comprehension_tlv_iter_get_length(iter);
const unsigned char *data = comprehension_tlv_iter_get_data(iter);
const unsigned char *data;
char *utf8;
/* DCS followed by some text, cannot be 1 */
@ -570,10 +570,12 @@ static gboolean parse_dataobj_text(struct comprehension_tlv_iter *iter,
return FALSE;
if (len == 0) {
*text = NULL;
*text = g_try_malloc0(1);
return TRUE;
}
data = comprehension_tlv_iter_get_data(iter);
utf8 = decode_text(data[0], len - 1, data + 1);
if (utf8 == NULL)