summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-02-03 12:12:15 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-02-03 12:12:15 +0800
commitbc1d53a7b9167491cd5b7252c96850a470201c6f (patch)
treedc17b32d2051399f3fbee483bb3c634734c45e97
parent5afc2bc1c9c8c39c082b2c44664e3f189d7bfae8 (diff)
downloadcompiz-with-glib-mainloop-bc1d53a7b9167491cd5b7252c96850a470201c6f.tar.gz
compiz-with-glib-mainloop-bc1d53a7b9167491cd5b7252c96850a470201c6f.tar.bz2
Fix possible segfault on 64-bit arch. due to passing 0 to va_list and retrieving it as pointer.
Forward port of commit 5a6dbfdea66620b3a6ae50540a75714e0a975ce7 to master
-rw-r--r--plugins/annotate/src/annotate.cpp8
-rw-r--r--plugins/clone/src/clone.cpp2
-rw-r--r--plugins/cube/src/cube.cpp2
-rw-r--r--plugins/move/src/move.cpp6
-rw-r--r--plugins/resize/src/resize.cpp2
-rw-r--r--plugins/rotate/src/rotate.cpp20
-rw-r--r--plugins/scale/src/scale.cpp2
-rw-r--r--plugins/screenshot/src/screenshot.cpp2
-rw-r--r--plugins/switcher/src/switcher.cpp2
-rw-r--r--plugins/water/src/water.cpp2
-rw-r--r--plugins/zoom/src/zoom.cpp4
11 files changed, 26 insertions, 26 deletions
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 26e53e9..4786dd2 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -395,7 +395,7 @@ AnnoScreen::initiate (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
- if (screen->otherGrabExist (0))
+ if (screen->otherGrabExist (NULL))
return false;
if (!grabIndex)
@@ -465,7 +465,7 @@ AnnoScreen::eraseInitiate (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
- if (screen->otherGrabExist (0))
+ if (screen->otherGrabExist (NULL))
return false;
if (!grabIndex)
@@ -492,7 +492,7 @@ AnnoScreen::rectangleInitiate (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
- if (screen->otherGrabExist (0))
+ if (screen->otherGrabExist (NULL))
return false;
if (!grabIndex)
@@ -521,7 +521,7 @@ AnnoScreen::circleInitiate (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
- if (screen->otherGrabExist (0))
+ if (screen->otherGrabExist (NULL))
return false;
if (!grabIndex)
diff --git a/plugins/clone/src/clone.cpp b/plugins/clone/src/clone.cpp
index 9352a4e..afdd39b 100644
--- a/plugins/clone/src/clone.cpp
+++ b/plugins/clone/src/clone.cpp
@@ -351,7 +351,7 @@ CloneScreen::initiate (CompAction *action,
CompOption::Vector options)
{
std::list <Clone *>::iterator it = clones.begin ();
- if (grab || screen->otherGrabExist ("clone", 0))
+ if (grab || screen->otherGrabExist ("clone", NULL))
return false;
if (!grabHandle)
diff --git a/plugins/cube/src/cube.cpp b/plugins/cube/src/cube.cpp
index 504ef5f..4dbfe65 100644
--- a/plugins/cube/src/cube.cpp
+++ b/plugins/cube/src/cube.cpp
@@ -1620,7 +1620,7 @@ PrivateCubeScreen::unfold (CompAction *action,
if (screen->vpSize ().width () * cs->priv->mNOutput < 4)
return false;
- if (screen->otherGrabExist ("rotate", "switcher", "cube", 0))
+ if (screen->otherGrabExist ("rotate", "switcher", "cube", NULL))
return false;
if (!cs->priv->mGrabIndex)
diff --git a/plugins/move/src/move.cpp b/plugins/move/src/move.cpp
index 42813f1..77556a5 100644
--- a/plugins/move/src/move.cpp
+++ b/plugins/move/src/move.cpp
@@ -65,7 +65,7 @@ moveInitiate (CompAction *action,
button = CompOption::getIntOptionNamed (options, "button", -1);
- if (s->otherGrabExist ("move", 0))
+ if (s->otherGrabExist ("move", NULL))
return false;
if (ms->w)
@@ -397,7 +397,7 @@ moveHandleMotionEvent (CompScreen *s,
{
if (abs (yRoot - workArea.y () - ms->snapOffY) >= SNAP_OFF)
{
- if (!s->otherGrabExist ("move", 0))
+ if (!s->otherGrabExist ("move", NULL))
{
int width = w->serverGeometry ().width ();
@@ -423,7 +423,7 @@ moveHandleMotionEvent (CompScreen *s,
{
if (abs (yRoot - workArea.y () - ms->snapBackY) < SNAP_BACK)
{
- if (!s->otherGrabExist ("move", 0))
+ if (!s->otherGrabExist ("move", NULL))
{
int wy;
diff --git a/plugins/resize/src/resize.cpp b/plugins/resize/src/resize.cpp
index 5a676d3..fa28b8e 100644
--- a/plugins/resize/src/resize.cpp
+++ b/plugins/resize/src/resize.cpp
@@ -236,7 +236,7 @@ resizeInitiate (CompAction *action,
return true;
}
- if (screen->otherGrabExist ("resize", 0))
+ if (screen->otherGrabExist ("resize", NULL))
return false;
if (rs->w)
diff --git a/plugins/rotate/src/rotate.cpp b/plugins/rotate/src/rotate.cpp
index f7a2c23..76a8dc3 100644
--- a/plugins/rotate/src/rotate.cpp
+++ b/plugins/rotate/src/rotate.cpp
@@ -392,12 +392,12 @@ RotateScreen::initiate (CompAction *action,
if (mRotateTimer.active () && mGrabWindow)
{
- if (screen->otherGrabExist ("rotate", "move", 0))
+ if (screen->otherGrabExist ("rotate", "move", NULL))
return false;
}
else
{
- if (screen->otherGrabExist ("rotate", "switcher", "cube", 0))
+ if (screen->otherGrabExist ("rotate", "switcher", "cube", NULL))
return false;
}
@@ -483,7 +483,7 @@ RotateScreen::rotate (CompAction *action,
return false;
if (screen->otherGrabExist ("rotate", "move", "switcher",
- "group-drag", "cube", 0))
+ "group-drag", "cube", NULL))
return false;
if (!direction)
@@ -597,7 +597,7 @@ RotateScreen::rotateFlip (int direction)
mMoveTo = 0.0f;
mSlow = false;
- if (screen->otherGrabExist ("rotate", "move", "group-drag", 0))
+ if (screen->otherGrabExist ("rotate", "move", "group-drag", NULL))
return false;
warpX = pointerX - (screen->width () * direction);
@@ -636,7 +636,7 @@ RotateScreen::rotateEdgeFlip (CompAction *action,
if (screen->vpSize ().width () < 2)
return false;
- if (screen->otherGrabExist ("rotate", "move", "group-drag", 0))
+ if (screen->otherGrabExist ("rotate", "move", "group-drag", NULL))
return false;
if (state & CompAction::StateInitEdgeDnd)
@@ -644,10 +644,10 @@ RotateScreen::rotateEdgeFlip (CompAction *action,
if (!optionGetEdgeFlipDnd ())
return false;
- if (screen->otherGrabExist ("rotate", 0))
+ if (screen->otherGrabExist ("rotate", NULL))
return false;
}
- else if (screen->otherGrabExist ("rotate", "group-drag", 0))
+ else if (screen->otherGrabExist ("rotate", "group-drag", NULL))
{
if (!optionGetEdgeFlipWindow ())
return false;
@@ -662,7 +662,7 @@ RotateScreen::rotateEdgeFlip (CompAction *action,
CompWindowStateStickyMask))
return false;
}
- else if (screen->otherGrabExist ("rotate", 0))
+ else if (screen->otherGrabExist ("rotate", NULL))
{
/* in that case, 'group-drag' must be the active screen grab */
if (!optionGetEdgeFlipWindow ())
@@ -865,7 +865,7 @@ RotateScreen::handleEvent (XEvent *event)
{
int dx;
- if (screen->otherGrabExist ("rotate", "switcher", "cube", 0))
+ if (screen->otherGrabExist ("rotate", "switcher", "cube", NULL))
break;
/* reset movement */
@@ -910,7 +910,7 @@ void
RotateWindow::activate ()
{
if (window->placed () &&
- !screen->otherGrabExist ("rotate", "switcher", "cube", 0))
+ !screen->otherGrabExist ("rotate", "switcher", "cube", NULL))
{
int dx;
diff --git a/plugins/scale/src/scale.cpp b/plugins/scale/src/scale.cpp
index feb1573..d266008 100644
--- a/plugins/scale/src/scale.cpp
+++ b/plugins/scale/src/scale.cpp
@@ -1033,7 +1033,7 @@ PrivateScaleScreen::scaleInitiateCommon (CompAction *action,
CompAction::State state,
CompOption::Vector &options)
{
- if (screen->otherGrabExist ("scale", 0))
+ if (screen->otherGrabExist ("scale", NULL))
return false;
match = CompOption::getMatchOptionNamed (options, "match",
diff --git a/plugins/screenshot/src/screenshot.cpp b/plugins/screenshot/src/screenshot.cpp
index ef80de5..b058d41 100644
--- a/plugins/screenshot/src/screenshot.cpp
+++ b/plugins/screenshot/src/screenshot.cpp
@@ -39,7 +39,7 @@ ShotScreen::initiate (CompAction *action,
if (xid != ::screen->root ())
return false;
- if (::screen->otherGrabExist ("screenshot", 0))
+ if (::screen->otherGrabExist ("screenshot", NULL))
return false;
if (!mGrabIndex)
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index 90c5ce4..611997a 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -204,7 +204,7 @@ SwitchScreen::initiate (SwitchWindowSelection selection,
{
int count;
- if (screen->otherGrabExist ("switcher", "scale", "cube", 0))
+ if (screen->otherGrabExist ("switcher", "scale", "cube", NULL))
return;
this->selection = selection;
diff --git a/plugins/water/src/water.cpp b/plugins/water/src/water.cpp
index 8face82..47fbc3a 100644
--- a/plugins/water/src/water.cpp
+++ b/plugins/water/src/water.cpp
@@ -1040,7 +1040,7 @@ waterInitiate (CompAction *action,
WATER_SCREEN (screen);
- if (!screen->otherGrabExist ("water", 0))
+ if (!screen->otherGrabExist ("water", NULL))
{
if (!ws->grabIndex)
{
diff --git a/plugins/zoom/src/zoom.cpp b/plugins/zoom/src/zoom.cpp
index 87fa9cf..290af37 100644
--- a/plugins/zoom/src/zoom.cpp
+++ b/plugins/zoom/src/zoom.cpp
@@ -394,7 +394,7 @@ zoomInitiate (CompAction *action,
ZOOM_SCREEN (screen);
- if (screen->otherGrabExist ("zoom", 0))
+ if (screen->otherGrabExist ("zoom", NULL))
return false;
if (!zs->grabIndex)
@@ -529,7 +529,7 @@ zoomInitiatePan (CompAction *action,
if (!(zs->zoomed & (1 << output)))
return false;
- if (screen->otherGrabExist ("zoom", 0))
+ if (screen->otherGrabExist ("zoom", NULL))
return false;
if (state & CompAction::StateInitButton)