enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

ensure clients possess comp_data before dereferencing it during x11 stacking 

ref T2566
This commit is contained in:
Mike Blumenkrantz 2015-07-21 14:34:11 -04:00
parent a6990c69a8
commit ef18cc3f93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_comp_x.c
View File

@ -645,7 +645,7 @@ _e_comp_x_client_stack(E_Client *ec)
ecore_x_window_shadow_tree_flush();
/* try stacking below */
if (e_comp_get(NULL)->nocomp_ec && (ec != e_comp_get(NULL)->nocomp_ec))
if (e_comp_get(NULL)->nocomp_ec && e_comp_get(NULL)->nocomp_ec->comp_data && (ec != e_comp_get(NULL)->nocomp_ec))
win = _e_comp_x_client_window_get(e_comp_get(NULL)->nocomp_ec);
else
{
@ -653,7 +653,7 @@ _e_comp_x_client_stack(E_Client *ec)
do
{
ec2 = e_client_above_get(ec2);
if (ec2 && (!ec2->new_client) &&
if (ec2 && ec2->comp_data && (!ec2->new_client) &&
(e_client_is_stacking(ec2) || ((!ec2->override) || ec2->internal)))
{
if (ec2->layer != ec->layer) break;
@ -670,7 +670,7 @@ _e_comp_x_client_stack(E_Client *ec)
do
{
ec2 = e_client_below_get(ec2);
if (ec2 && (!ec2->new_client) &&
if (ec2 && ec2->comp_data && (!ec2->new_client) &&
(e_client_is_stacking(ec2) || ((!ec2->override) || ec2->internal)))
{
if (ec2->layer != ec->layer) break;