Compiz

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

  1. fix-1065814
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3414
Merged at revision: 3414
Proposed branch: lp:~vanvugt/compiz/fix-1065814
Merge into: lp:compiz/0.9.9
Diff against target: 11 lines (+1/-1)
1 file modified
compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1065814
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
jenkins (community) continuous-integration Approve
Review via email: mp+129348@code.launchpad.net

Commit message

Don't try writing to const static memory. Any sane compiler like clang will
put const static data into a read-only memory section. This means any write
to it will segfault.
(LP: #1065814)

Description of the change

See commit message.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

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

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c'
2--- compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c 2012-10-06 14:12:11 +0000
3+++ compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c 2012-10-12 05:30:21 +0000
4@@ -416,7 +416,7 @@
5 ccsGNOMEIntegratedSettingsList ()
6 {
7 static GOnce initIntegratedSettings = G_ONCE_INIT;
8- static const CCSGNOMEIntegratedSettingsList settings[CCS_GNOME_INTEGRATED_SETTINGS_LIST_SIZE];
9+ static CCSGNOMEIntegratedSettingsList settings[CCS_GNOME_INTEGRATED_SETTINGS_LIST_SIZE];
10
11 g_once (&initIntegratedSettings, ccsGNOMEIntegrationInitializeIntegratedSettingsList, (gpointer) settings);
12

Subscribers

People subscribed via source and target branches