Mir

Merge lp:~vanvugt/mir/avoid-regressions-of-1212516 into lp:~mir-team/mir/trunk

  1. avoid-regressions-of-1212516
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 993
Proposed branch: lp:~vanvugt/mir/avoid-regressions-of-1212516
Merge into: lp:~mir-team/mir/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
tests/integration-tests/test_drm_auth_magic.cpp (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/avoid-regressions-of-1212516
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Review via email: mp+181241@code.launchpad.net

Commit message

Check a connection is valid (not NULL) before trying to dereference it.
Such a NULL dereference led to worrying valgrind errors seen in LP: #1212516.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:991
http://jenkins.qa.ubuntu.com/job/mir-ci/1342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/580
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/580/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1342/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/605/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1582/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1683
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/260/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
2--- tests/integration-tests/test_drm_auth_magic.cpp 2013-08-02 03:01:12 +0000
3+++ tests/integration-tests/test_drm_auth_magic.cpp 2013-08-21 10:10:25 +0000
4@@ -120,6 +120,8 @@
5 int const no_error{0};
6 int status{67};
7
8+ ASSERT_TRUE(mir_connection_is_valid(connection));
9+
10 mir_wait_for(mir_connection_drm_auth_magic(connection, magic,
11 drm_auth_magic_callback,
12 &status));

Subscribers

People subscribed via source and target branches