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)

Unmerged revisions

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp	2012-12-07 06:01:09 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp	2012-12-12 08:58:21 +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 <>
@@ -550,27 +553,6 @@
     return settingValue;
 }
 
-CCSSettingValuePtr
-ListValueToSettingValueList (CCSSettingValue *listChild)
-{
-    listChild->isListChild = TRUE;
-
-    CCSSettingValueList valueListHead = ccsSettingValueListAppend (NULL, listChild);
-    CCSSettingValuePtr  valueListValue (AutoDestroy (NewCCSSettingValue (),
-                                                    ccsSettingValueUnref));
-
-    valueListValue->value.asList = valueListHead;
-
-    return valueListValue;
-}
-
-template <typename SettingValueType>
-CCSSettingValuePtr
-RawValueToListValue (const SettingValueType &value)
-{
-    return ListValueToSettingValueList (RawValueToCCSValue (value));
-}
-
 class ContainedValueGenerator
 {
     private: