diff options
author | jinwoo.shin <jw0227.shin@samsung.com> | 2015-10-12 18:30:49 +0900 |
---|---|---|
committer | jinwoo.shin <jw0227.shin@samsung.com> | 2015-10-12 18:31:43 +0900 |
commit | 0381769c4482de23587376eb8c4762ecceaab9c1 (patch) | |
tree | 292fda8ac4c4f24083ffdf282ac325d8add7d2db | |
parent | 85791c4998303672786597853b4e9bfc0de02064 (diff) | |
download | air_livetv-0381769c4482de23587376eb8c4762ecceaab9c1.tar.gz air_livetv-0381769c4482de23587376eb8c4762ecceaab9c1.tar.bz2 air_livetv-0381769c4482de23587376eb8c4762ecceaab9c1.zip |
Fix prevent issuessubmit/tizen/20151013.004713accepted/tizen/tv/20151013.040522
CIDs : 471039, 475039
Change-Id: I9f83c89ffc8812a71c4a649cc193d721449d8884
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
-rw-r--r-- | src/util.c | 6 | ||||
-rw-r--r-- | src/view_channelnumber.c | 5 |
2 files changed, 6 insertions, 5 deletions
@@ -346,6 +346,8 @@ void util_draw_channel_info(Evas_Object *obj, evas_object_data_set(obj, KEY_SVCID, (void *)channel_info->service_id); prog_req = calloc(1, sizeof(*prog_req)); + if (!prog_req) + goto err; prog_req->tv_program_cb = _tv_program_cb; prog_req->user_data = obj; @@ -356,6 +358,9 @@ void util_draw_channel_info(Evas_Object *obj, if (channel_info->service_id == current_service) { prog_req = calloc(1, sizeof(*prog_req)); + if (!prog_req) + goto err; + prog_req->tv_program_cb = _tv_program_cb; prog_req->user_data = obj; r = tv_epg_get_program(channel_info->service_id, prog_req); @@ -363,6 +368,7 @@ void util_draw_channel_info(Evas_Object *obj, free(prog_req); } +err: if (r < 0 && viewmgr_get_view_state(VIEW_CHANNELINFO) == VIEW_STATE_VISIBLE) { op = START_HIDE_TIMER; diff --git a/src/view_channelnumber.c b/src/view_channelnumber.c index 6404c0e..9e395ac 100644 --- a/src/view_channelnumber.c +++ b/src/view_channelnumber.c @@ -206,11 +206,6 @@ static void _update_number_info(struct _priv *priv) { char buf[BUF_MAX] = "\0"; - if (!priv->number) { - _ERR("Wrong channel number"); - return; - } - if (strlen(priv->number) > NUMBER_MAX) { strncpy(buf, priv->number, NUMBER_MAX); strncat(buf, "-", 1); |