pidgin/pidgin

Re-write remove_prefs to not use recursion.

2019-11-05, Elliott Sales de Andrade
d1ad503fe389
Parents 890547f0fa6e
Children d036854702b3
Re-write remove_prefs to not use recursion.

This also fixes the possible use-after-free that scan-build seems to
think is there.
1 files changed, 50 insertions(+), 22 deletions(-)
  • +50 -22
    libpurple/prefs.c
    • --- a/libpurple/prefs.c Tue Nov 05 20:24:59 2019 -0500
    +++ b/libpurple/prefs.c Tue Nov 05 20:27:32 2019 -0500
    @@ -758,35 +758,16 @@
    g_strdup(tmp->data));
    }
    -
    static void
    -remove_pref(struct purple_pref *pref)
    +free_pref(struct purple_pref *pref)
    {
    char *name;
    - if(!pref)
    - return;
    -
    - while(pref->first_child)
    - remove_pref(pref->first_child);
    -
    - if(pref == &prefs)
    - return;
    -
    - if(pref->parent->first_child == pref) {
    - pref->parent->first_child = pref->sibling;
    - } else {
    - struct purple_pref *sib = pref->parent->first_child;
    - while(sib && sib->sibling != pref)
    - sib = sib->sibling;
    - if(sib)
    - sib->sibling = pref->sibling;
    - }
    -
    name = pref_full_name(pref);
    - if (prefs_loaded)
    + if (prefs_loaded) {
    purple_debug_info("prefs", "removing pref %s\n", name);
    + }
    g_hash_table_remove(prefs_hash, name);
    g_free(name);
    @@ -798,6 +779,53 @@
    g_free(pref);
    }
    +static void
    +remove_pref(struct purple_pref *pref)
    +{
    + struct purple_pref *child;
    +
    + if (!pref) {
    + return;
    + }
    +
    + child = pref->first_child;
    + while (child) {
    + struct purple_pref *next;
    + if (child->first_child) {
    + next = child->first_child;
    + } else if (child->sibling) {
    + next = child->sibling;
    + free_pref(child);
    + } else {
    + if (child->parent != pref) {
    + next = child->parent;
    + } else {
    + next = NULL;
    + }
    + free_pref(child);
    + }
    + child = next;
    + }
    +
    + if (pref == &prefs) {
    + return;
    + }
    +
    + if (pref->parent->first_child == pref) {
    + pref->parent->first_child = pref->sibling;
    + } else {
    + child = pref->parent->first_child;
    + while (child && child->sibling != pref) {
    + child = child->sibling;
    + }
    + if (child) {
    + child->sibling = pref->sibling;
    + }
    + }
    +
    + free_pref(pref);
    +}
    +
    void
    purple_prefs_remove(const char *name)
    {