Unity

Merge lp://qastaging/~dandrader/unity/lp942625 into lp://qastaging/unity

lp942625
Merge into trunk

Proposed by Daniel d'Andrada on 2012-03-01

Status:

Superseded

Proposed branch:

lp://qastaging/~dandrader/unity/lp942625

Merge into:

lp://qastaging/unity

Diff against target:

32 lines (+8/-3)

1 file modified

plugins/unityshell/src/GestureEngine.cpp (+8/-3)

To merge this branch:

bzr merge lp://qastaging/~dandrader/unity/lp942625

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2012-03-01	Needs Fixing on 2012-03-01
Review via email: mp+95450@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-03-01.

Description of the change

Fixes lp:942625

GestureEngine::FindCompWindow() would enter in an infinite loop if the window passed to it is the root window since its break condition (parent == root) would never be reached as parent would be zero.

Also includes some other safeguards around the same issue.

Revision history for this message

Andrea Cimitan (cimi) wrote on 2012-03-01:

8 + Status status;
9
10 XQueryTree(_screen->dpy(), window, &root, &parent, &children, &nchildren);
11 + if (status == 0)
12 + break;

Did you forget to initialize 'status'?

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2012-03-01:

> 8 + Status status;
> 9
> 10 XQueryTree(_screen->dpy(), window, &root, &parent, &children,
> &nchildren);
> 11 + if (status == 0)
> 12 + break;
>
> Did you forget to initialize 'status'?

Yes indeed.