Unity

Merge lp://qastaging/~gordallott/unity/u-p-s-segfaulting-fix into lp://qastaging/unity/4.0

  1. u-p-s-segfaulting-fix
  2. Merge into 4.0
Proposed by Gord Allott
Status: Merged
Merged at revision: 1713
Proposed branch: lp://qastaging/~gordallott/unity/u-p-s-segfaulting-fix
Merge into: lp://qastaging/unity/4.0
Diff against target: 16 lines (+4/-1)
1 file modified
services/panel-service.c (+4/-1)
To merge this branch: bzr merge lp://qastaging/~gordallott/unity/u-p-s-segfaulting-fix
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+79312@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2011-10-13.

Description of the change

fixes the panel service segfaulting, but leaves in a memory leak (fixing the mem leak caused the problem)

leaks one IndicatorObjectEntry per geometry sync - maybe, honestly i'm not even sure it gets leaked

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote : Posted in a previous version of this proposal

the actual diff, lp-propose-merge proposed against trunk instead of 4.0

=== modified file 'services/panel-service.c'
--- services/panel-service.c 2011-10-11 14:58:32 +0000
+++ services/panel-service.c 2011-10-13 15:56:29 +0000
@@ -1160,8 +1160,11 @@

           if (entry2geometry_hash == NULL)
           {
+ //FIXME - this leaks memory but i'm not 100% on the logic,
+ // using g_free as the keys destructor function causes all
+ // kinds of problems
             entry2geometry_hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- g_free, g_free);
+ NULL, g_free);
             g_hash_table_insert (priv->panel2entries_hash, g_strdup (panel_id),
                                  entry2geometry_hash);
           }

Revision history for this message
Neil J. Patel (njpatel) : Posted in a previous version of this proposal
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: