summaryrefslogtreecommitdiff
path: root/plugins/move/src/move.cpp
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 /plugins/move/src/move.cpp
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
Diffstat (limited to 'plugins/move/src/move.cpp')
-rw-r--r--plugins/move/src/move.cpp6
1 files changed, 3 insertions, 3 deletions
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;