Mir

Merge lp:~vanvugt/mir/fix-1215754 into lp:~mir-team/mir/trunk

  1. fix-1215754
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Robert Ancell
Approved revision: no longer in the source branch.
Merged at revision: 1014
Proposed branch: lp:~vanvugt/mir/fix-1215754
Merge into: lp:~mir-team/mir/trunk
Diff against target: 36 lines (+3/-1)
3 files modified
examples/fingerpaint.c (+1/-0)
examples/multiwin.c (+1/-0)
include/shared/mir_toolkit/client_types.h (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1215754
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Thomas Voß (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+181984@code.launchpad.net

Commit message

Fix uninitialized fields causing strange exceptions in some clients such as
fingerpaint and multiwin since r991. (LP: #1215754)

The uninitialized field output_id was only introduced in r991. Of course,
giving it an invalid value should not cause such wacky exceptions. I'll
log a bug to improve the error checking separately.

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

PASSED: Continuous integration, rev:1010
http://jenkins.qa.ubuntu.com/job/mir-ci/1383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/621
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/621/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM. Thanks for the quick fix.

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/fingerpaint.c'
2--- examples/fingerpaint.c 2013-08-23 10:39:40 +0000
3+++ examples/fingerpaint.c 2013-08-25 08:52:30 +0000
4@@ -303,6 +303,7 @@
5 }
6
7 parm.buffer_usage = mir_buffer_usage_software;
8+ parm.output_id = mir_display_output_id_invalid;
9
10 unsigned int const pf_size = 32;
11 MirPixelFormat formats[pf_size];
12
13=== modified file 'examples/multiwin.c'
14--- examples/multiwin.c 2013-08-23 10:39:40 +0000
15+++ examples/multiwin.c 2013-08-25 08:52:30 +0000
16@@ -139,6 +139,7 @@
17 mir_connection_get_available_surface_formats(conn, formats, pf_size, &valid_formats);
18
19 parm.buffer_usage = mir_buffer_usage_software;
20+ parm.output_id = mir_display_output_id_invalid;
21 parm.pixel_format = mir_pixel_format_invalid;
22 for (f = 0; f < valid_formats; f++)
23 {
24
25=== modified file 'include/shared/mir_toolkit/client_types.h'
26--- include/shared/mir_toolkit/client_types.h 2013-08-23 15:27:41 +0000
27+++ include/shared/mir_toolkit/client_types.h 2013-08-25 08:52:30 +0000
28@@ -142,7 +142,7 @@
29 * Use one of the output ids from MirDisplayConfiguration/MirDisplayOutput
30 * to place a surface on that output. Only fullscreen placements are
31 * currently supported. If you don't have special placement requirements,
32- * use the value mir_display_output_invalid.
33+ * use the value mir_display_output_id_invalid.
34 */
35 uint32_t output_id;
36 } MirSurfaceParameters;

Subscribers

People subscribed via source and target branches