From: Forrest Zhao <forrest.zhao@intel.com>
To: johan.hedberg@gmail.com
Cc: linux-bluetooth@vger.kernel.org, forrest.zhao@gmail.com,
Forrest Zhao <forrest.zhao@intel.com>
Subject: [PATCH] Check modem_obj_path is not NULL
Date: Mon, 29 Mar 2010 16:32:54 -0400 [thread overview]
Message-ID: <1269894774-3193-1-git-send-email-forrest.zhao@intel.com> (raw)
This could prevent crash in case modem_obj_path is NULL.
---
audio/telephony-ofono.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/audio/telephony-ofono.c b/audio/telephony-ofono.c
index 45c3905..c145e87 100644
--- a/audio/telephony-ofono.c
+++ b/audio/telephony-ofono.c
@@ -281,6 +281,10 @@ void telephony_dial_number_req(void *telephony_device, const char *number)
debug("telephony-ofono: dial request to %s", number);
+ if (!modem_obj_path)
+ telephony_dial_number_rsp(telephony_device,
+ CME_ERROR_AG_FAILURE);
+
if (!strncmp(number, "*31#", 4)) {
number += 4;
clir = "enabled";
@@ -311,6 +315,10 @@ void telephony_transmit_dtmf_req(void *telephony_device, char tone)
debug("telephony-ofono: transmit dtmf: %c", tone);
+ if (!modem_obj_path)
+ telephony_transmit_dtmf_rsp(telephony_device,
+ CME_ERROR_AG_FAILURE);
+
tone_string = g_strdup_printf("%c", tone);
ret = send_method_call(OFONO_BUS_NAME, modem_obj_path,
OFONO_VCMANAGER_INTERFACE,
@@ -531,6 +539,9 @@ done:
static int get_registration_and_signal_status()
{
+ if (!modem_obj_path)
+ return -ENOENT;
+
return send_method_call(OFONO_BUS_NAME, modem_obj_path,
OFONO_NETWORKREG_INTERFACE,
"GetProperties", get_registration_reply,
--
1.6.1.3
next reply other threads:[~2010-03-29 20:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 20:32 Forrest Zhao [this message]
2010-03-29 7:39 ` [PATCH] Check modem_obj_path is not NULL Johan Hedberg
2010-03-29 7:58 ` Zhao Forrest
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=1269894774-3193-1-git-send-email-forrest.zhao@intel.com \
--to=forrest.zhao@intel.com \
--cc=forrest.zhao@gmail.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).