From: Yang Gu <yang.gu@intel.com>
To: ofono@ofono.org
Subject: [PATCH 2/4] Handle the conversion failure when parsing item
Date: Tue, 16 Mar 2010 18:01:38 +0800 [thread overview]
Message-ID: <1268733700-30154-2-git-send-email-yang.gu@intel.com> (raw)
In-Reply-To: <1268733700-30154-1-git-send-email-yang.gu@intel.com>
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
---
src/stkutil.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
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;
}
--
1.6.3.3
next prev parent reply other threads:[~2010-03-16 10:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-16 10:01 [PATCH 1/4] Fix the structure of stk_subaddress Yang Gu
2010-03-16 10:01 ` Yang Gu [this message]
2010-03-16 10:01 ` [PATCH 3/4] Add parser for file list objects Yang Gu
2010-03-16 10:01 ` [PATCH 4/4] Add parser for location information objects Yang Gu
2010-03-16 18:46 ` Marcel Holtmann
2010-03-16 18:44 ` [PATCH 3/4] Add parser for file list objects Marcel Holtmann
2010-03-16 20:01 ` Denis Kenzior
2010-03-16 18:36 ` [PATCH 2/4] Handle the conversion failure when parsing item Marcel Holtmann
2010-03-16 20:27 ` Denis Kenzior
2010-03-17 4:40 ` Marcel Holtmann
2010-03-16 20:29 ` Denis Kenzior
2010-03-17 3:33 ` Gu, Yang
2010-03-17 4:44 ` Marcel Holtmann
2010-03-16 20:28 ` [PATCH 1/4] Fix the structure of stk_subaddress Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268733700-30154-2-git-send-email-yang.gu@intel.com \
--to=yang.gu@intel.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.