← Back to branch summary

~focus-follows-mouse/ubuntu/precise/compiz/fix-883383

« back to all changes in this revision

Viewing changes to debian/patches/04_fix_insertServerWindow_crash.patch

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2011-10-04 13:49:01 UTC
  • Revision ID: package-import@ubuntu.com-20111004134901-wagonriu9jqsoxzy
Tags: 1:0.9.6+bzr20110929-0ubuntu3
https://launchpad.net/bugs/857487
https://launchpad.net/bugs/857738
* debian/patches/04_fix_insertServerWindow_crash.patch:
  - compiz crashed with SIGSEGV in CompScreen::insertServerWindow()
    (LP: #857487)
* debian/patches/05_fix_reconfigureXWindow_crash.patch:
  - compiz crashed with SIGABRT in raise() (LP: #857738)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_fix_insertServerWindow_crash.patch
 
1
=== modified file 'src/screen.cpp'
 
2
Index: compiz-0.9.6+bzr20110929/src/screen.cpp
 
3
===================================================================
 
4
--- compiz-0.9.6+bzr20110929.orig/src/screen.cpp        2011-10-04 18:01:41.338791399 +0800
 
5
+++ compiz-0.9.6+bzr20110929/src/screen.cpp     2011-10-04 18:01:56.926868696 +0800
 
6
@@ -2615,7 +2615,7 @@
 
7
     if (it == priv->windows.end ())
 
8
     {
 
9
        compLogMessage ("core", CompLogLevelDebug, "could not insert 0x%x above 0x%x",
 
10
-                       (unsigned int) (*it)->priv->serverId, aboveId);
 
11
+                       (unsigned int) w->priv->serverId, aboveId);
 
12
 #ifdef DEBUG
 
13
        abort ();
 
14
 #endif
 
15
@@ -2673,8 +2673,8 @@
 
16
 
 
17
     if (it == priv->serverWindows.end ())
 
18
     {
 
19
-       compLogMessage ("core", CompLogLevelDebug, "could not insert 0x%x above 0x%x",
 
20
-                       (unsigned int) (*it)->priv->serverId, aboveId);
 
21
+       compLogMessage ("core", CompLogLevelWarn, "could not insert 0x%x above 0x%x",
 
22
+                       (unsigned int) w->priv->serverId, aboveId);
 
23
 #ifdef DEBUG
 
24
        abort ();
 
25
 #endif