Unity

Merge lp:~azzar1/unity/fix-crash-adwaita-csd-minimize into lp:unity

  1. fix-crash-adwaita-csd-minimize
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4111
Proposed branch: lp:~azzar1/unity/fix-crash-adwaita-csd-minimize
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/inputremover.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-crash-adwaita-csd-minimize
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+292899@code.launchpad.net

Commit message

Properly calculate array indexes to avoid crashes.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

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

PASSED: Continuous integration, rev:4106
http://jenkins.qa.ubuntu.com/job/unity-ci/1435/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/85

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/inputremover.cpp'
2--- plugins/unityshell/src/inputremover.cpp 2016-03-09 17:25:16 +0000
3+++ plugins/unityshell/src/inputremover.cpp 2016-04-26 10:34:36 +0000
4@@ -354,7 +354,7 @@
5
6 for (int i = 0; i < nInput; ++i)
7 {
8- const unsigned int position = dataSize + (i * 4);
9+ const unsigned int position = headerSize + (i * 4);
10
11 data[position + 0] = input[i].x;
12 data[position + 1] = input[i].y;