summaryrefslogtreecommitdiff
path: root/plugins/scale/src/scale.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/scale/src/scale.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/scale/src/scale.cpp')
-rw-r--r--plugins/scale/src/scale.cpp2
1 files changed, 1 insertions, 1 deletions
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",