Merge lp:~tiagosh/telephony-service/fix-1433068 into lp:telephony-service/rtm-15.04

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 1043
Merged at revision: 1101
Proposed branch: lp:~tiagosh/telephony-service/fix-1433068
Merge into: lp:telephony-service/rtm-15.04
Diff against target: 12 lines (+1/-1)
1 file modified
libtelephonyservice/callentry.cpp (+1/-1)
To merge this branch: bzr merge lp:~tiagosh/telephony-service/fix-1433068
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Gustavo Pichorim Boiko Pending
Review via email: mp+263930@code.launchpad.net

This proposal supersedes a proposal from 2015-03-17.

Commit message

Check if targetContact() returns a valid pointer before using it.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

Description of the change

Check if targetContact() returns a valid pointer before using it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote : Posted in a previous version of this proposal

Looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libtelephonyservice/callentry.cpp'
2--- libtelephonyservice/callentry.cpp 2015-04-28 20:44:57 +0000
3+++ libtelephonyservice/callentry.cpp 2015-07-06 16:21:11 +0000
4@@ -295,7 +295,7 @@
5
6 QString CallEntry::phoneNumber() const
7 {
8- if (mChannel->isConference() || !mChannel->actualFeatures().contains(Tp::CallChannel::FeatureCore)) {
9+ if (mChannel->isConference() || !mChannel->actualFeatures().contains(Tp::CallChannel::FeatureCore) || mChannel->targetContact().isNull()) {
10 return "";
11 }
12 return mChannel->targetContact()->id();

Subscribers

People subscribed via source and target branches