lib: fix g_hash_table related read-after-free bug

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index f0bfe5667fba4736996583830047d7529cd390fc..eddb780c69ebc76ab8870fb93dfb23d01e1a6176 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -652,7 +652,7 @@ parse_references (void *ctx,
        ref = _parse_message_id (ctx, refs, &refs);
 
        if (ref && strcmp (ref, message_id)) {
        ref = _parse_message_id (ctx, refs, &refs);
 
        if (ref && strcmp (ref, message_id)) {

-           g_hash_table_insert (hash, ref, NULL);
+           g_hash_table_add (hash, ref);

            last_ref = ref;
        }
     }
            last_ref = ref;
        }
     }


@@ -661,7 +661,7 @@ parse_references (void *ctx,
      * reference to the database.  We should avoid making a message
      * its own parent, thus the above check.
      */
      * reference to the database.  We should avoid making a message
      * its own parent, thus the above check.
      */

-    return last_ref;
+    return talloc_strdup(ctx, last_ref);

 }
 
 notmuch_status_t
 }
 
 notmuch_status_t