Merge lp:~phablet-team/ofono/lp-1260388 into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

rilmodem/sms: Don't parse SMS error reply (LP: #1260388)

This fixes a crash when an error reply is received from rild for a SMS request. In this case, the returned message is zero-length, but the code attempts to parse it anyways, resulting in a crash in parcel.c:parcel_r_int32().

Tested on maguro r62 by sending a couple text messages abd verifying no crashes occurred.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6847
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/16/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Tested with maguro, working as expected.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-10 01:06:29 +0000
+++ debian/changelog	2013-12-12 23:28:14 +0000
@@ -1,3 +1,10 @@
+ofono (1.12+bzr6847-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Tony Espy ]
+  * rilmodem/sms: Don't parse SMS error reply (LP: #1260388)
+
+ -- Tony Espy <[e-mail]>  Thu, 12 Dec 2013 17:15:01 -0500
+
 ofono (1.12+bzr6846-0ubuntu1) trusty; urgency=low
 
   [ Alfonso Sanchez-Beato ]
 
=== modified file 'drivers/rilmodem/sms.c'
--- drivers/rilmodem/sms.c	2013-11-19 11:18:44 +0000
+++ drivers/rilmodem/sms.c	2013-12-12 23:28:14 +0000
@@ -144,16 +144,15 @@
 	struct ofono_error error;
 	ofono_sms_submit_cb_t cb = cbd->cb;
 	struct sms_data *sd = cbd->user;
-	int mr;
+	int mr = 0;
 
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
+		mr = g_ril_reply_parse_sms_response(sd->ril, message);
 	} else {
 		decode_ril_error(&error, "FAIL");
 	}
 
-	mr = g_ril_reply_parse_sms_response(sd->ril, message);
-
 	cb(&error, mr, cbd->data);
 }