Merge lp:~bregma/compiz/lp-1101554 into lp:compiz/0.9.12

[Stephen M. Webb]

dodge plugin: avoid potential null pointer dereferences

Avoid potential NULL pointer dereferences in the Dodge plugin.

The code was using dynamic_cast<>() to downcast animation pointers, and sometimes did not check the result. It may be the case that dynamic_cast<>() is inappropriate and should be replaced by static_cast<>() but that would take a good deal more analysis and some good unit tests (which in turn would necessitate an ABI break), something that's not going ot happen in the forseeable future.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3907
http://jenkins.qa.ubuntu.com/job/compiz-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bregma/compiz/lp-1101554]

3908. By Stephen M. Webb on 2014-12-02

fixed sudden but inevitable change of variable name

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3908
http://jenkins.qa.ubuntu.com/job/compiz-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/22/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Yes

review: Approve

=== modified file 'plugins/animation/src/dodge.cpp'
--- plugins/animation/src/dodge.cpp	2013-05-19 15:04:07 +0000
+++ plugins/animation/src/dodge.cpp	2014-12-02 18:48:14 +0000
@@ -232,6 +232,9 @@
 	DodgeAnim *animDodger =
 	    dynamic_cast<DodgeAnim *> (adw->curAnimation ());
 
+	if (!animDodger)
+	    continue;
+
 	if (!(animDodger->mTransformProgress > 0.5f))
 	    break;
     }
@@ -456,6 +459,8 @@
 		if (curAnim && curAnim->info () == AnimEffectDodge)
 		{
 		    DodgeAnim *animDodger = dynamic_cast<DodgeAnim *> (curAnim);
+		    if (!animDodger)
+			continue;
 
 		    if (animDodger->mDodgeSubjectWin == mWindow)
 			animDodger->mDodgeSubjectWin = NULL;
@@ -604,6 +609,8 @@
 	}
 
 	DodgeAnim *animDodger = dynamic_cast<DodgeAnim *> (adw->curAnimation ());
+	if (!animDodger)
+	    continue;
 
 	animDodger->mDodgeSubjectWin = mWindow;
 
@@ -823,6 +830,8 @@
 		continue;
 
 	    DodgeAnim *dodgeAnim = dynamic_cast<DodgeAnim *> (curAnim);
+	    if (!dodgeAnim)
+		continue;
 
 	    dodgeAnim->mDodgeMaxAmountX = dodgeAmountX + offsetX;
 	    dodgeAnim->mDodgeMaxAmountY = dodgeAmountY + offsetY;