Merge lp:~vanvugt/compiz/fix-1089251 into lp:compiz/0.9.9

[Daniel van Vugt]

Fix segfaults in compizconfig_test_ccs_setting, due to a reference pointing
at a temporary. (LP: #1089251)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3525
http://jenkins.qa.ubuntu.com/job/compiz-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/323/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/323//rebuild/?

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

Ah of course.

That one was confusing me for a while, thanks for catching it :)

review: Approve

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp	2012-12-12 09:00:28 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp	2012-12-12 09:00:28 +0000
@@ -490,16 +490,19 @@
 	typedef CopyRawValueBase <const char *> Parent;
 
 	CopyRawValue (const char * value) :
-	    CopyRawValueBase <const char *> (value)
+	    CopyRawValueBase <const char *> (ptr),
+	    ptr (value)
 	{
 	}
 
 	ReturnType operator () ()
 	{
-	    /* XXX: Valgrind complains here that mValue is uninitialized, but
-	     * verification using gdb confirms that isn't true */
 	    return strdup (Parent::mValue);
 	}
+
+    private:
+	// mValue is a reference so it needs a persistent variable to point at
+	const char *ptr;
 };
 
 template <>