diff options
| author | Sam Spilsbury <smspillaz@gmail.com> | 2010-02-03 12:12:15 +0800 |
|---|---|---|
| committer | Sam Spilsbury <smspillaz@gmail.com> | 2010-02-03 12:12:15 +0800 |
| commit | bc1d53a7b9167491cd5b7252c96850a470201c6f (patch) | |
| tree | dc17b32d2051399f3fbee483bb3c634734c45e97 /plugins/zoom | |
| parent | 5afc2bc1c9c8c39c082b2c44664e3f189d7bfae8 (diff) | |
| download | compiz-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/zoom')
| -rw-r--r-- | plugins/zoom/src/zoom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |