Mir

Merge lp:~albaguirre/mir/fix-some-ubsan-findings into lp:mir

  1. fix-some-ubsan-findings
  2. Merge into development-branch
Proposed by Alberto Aguirre
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3167
Proposed branch: lp:~albaguirre/mir/fix-some-ubsan-findings
Merge into: lp:mir
Diff against target: 33 lines (+6/-6)
2 files modified
examples/xcursor.c (+4/-4)
tests/unit-tests/client/test_client_display_conf.cpp (+2/-2)
To merge this branch: bzr merge lp:~albaguirre/mir/fix-some-ubsan-findings
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Kevin DuBois (community) Approve
Review via email: mp+279344@code.launchpad.net

Commit message

fix some complaints from UBSan

Description of the change

fix some complaints from UBSan

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

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

PASSED: Continuous integration, rev:3162
http://jenkins.qa.ubuntu.com/job/mir-ci/5753/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5110
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5110
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7640
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25739
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/79/console

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

review: Approve (continuous-integration)
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/2219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5171
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4077/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/53
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/53
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5119
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7649
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25752

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

Unrelated:

6: [ RUN ] SystemCompositorWindowManager.if_a_surface_posts_client_gets_focus
...
6: /mir/tools/detect_fd_leaks.bash: line 84: 931 Segmentation fault (core dumped) $@ 2>&1

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

> Unrelated:
>
> 6: [ RUN ] SystemCompositorWindowManager.if_a_surface_posts_client_gets_focus
> ...
> 6: /mir/tools/detect_fd_leaks.bash: line 84: 931 Segmentation fault
> (core dumped) $@ 2>&1

lp:1522356

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 'examples/xcursor.c'
2--- examples/xcursor.c 2015-10-13 16:09:31 +0000
3+++ examples/xcursor.c 2015-12-02 20:11:27 +0000
4@@ -277,10 +277,10 @@
5
6 if ((*file->read) (file, bytes, 4) != 4)
7 return XcursorFalse;
8- *u = ((bytes[0] << 0) |
9- (bytes[1] << 8) |
10- (bytes[2] << 16) |
11- (bytes[3] << 24));
12+ *u = (((XcursorUInt)bytes[0] << 0) |
13+ ((XcursorUInt)bytes[1] << 8) |
14+ ((XcursorUInt)bytes[2] << 16) |
15+ ((XcursorUInt)bytes[3] << 24));
16 return XcursorTrue;
17 }
18
19
20=== modified file 'tests/unit-tests/client/test_client_display_conf.cpp'
21--- tests/unit-tests/client/test_client_display_conf.cpp 2015-06-25 03:00:08 +0000
22+++ tests/unit-tests/client/test_client_display_conf.cpp 2015-12-02 20:11:27 +0000
23@@ -35,8 +35,8 @@
24
25 void fill(mp::DisplayOutput* out)
26 {
27- out->add_pixel_format(4);
28- out->set_current_format(45);
29+ out->add_pixel_format(mir_pixel_format_xrgb_8888);
30+ out->set_current_format(mir_pixel_format_argb_8888);
31 auto mode = out->add_mode();
32 mode->set_horizontal_resolution(4);
33 mode->set_vertical_resolution(558);

Subscribers

People subscribed via source and target branches