Mir

Merge lp:~aacid/mir/fix_mismatched_delete into lp:mir

Proposed by Albert Astals Cid
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1136
Proposed branch: lp:~aacid/mir/fix_mismatched_delete
Merge into: lp:mir
Diff against target: 11 lines (+1/-1)
1 file modified
src/server/graphics/android/hwc_layerlist.cpp (+1/-1)
To merge this branch: bzr merge lp:~aacid/mir/fix_mismatched_delete
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Review via email: mp+190885@code.launchpad.net

This proposal supersedes a proposal from 2013-10-14.

Commit message

Free Mismatched free() / delete / delete [] reported by valgrind

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Still wrong target branch :)

review: Needs Resubmitting
Revision history for this message
Albert Astals Cid (aacid) wrote :

Now

Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

some sort of ps-jenkins autolanding failure? looks okay to me

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

http://10.97.0.26:8080/job/generic-land/18481/console fails because this proposed branch does not include the fix in debian/changelog (lp:mir revno 1099). You need to merge it in this proposed branch, it's not enough to have it in the target branch :-/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/graphics/android/hwc_layerlist.cpp'
2--- src/server/graphics/android/hwc_layerlist.cpp 2013-09-24 22:20:17 +0000
3+++ src/server/graphics/android/hwc_layerlist.cpp 2013-10-14 08:12:36 +0000
4@@ -70,7 +70,7 @@
5 {
6 if (self.visibleRegionScreen.rects)
7 {
8- delete self.visibleRegionScreen.rects;
9+ delete[] self.visibleRegionScreen.rects;
10 }
11 }
12

Subscribers

People subscribed via source and target branches