Wireshark-commits: [Wireshark-commits] master 8fbc0db: conversion: do not free conversation memory
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 8 Jul 2014 03:46:06 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8fbc0db7d2cc4c040d9cba7623a463e093a9ce5a
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

8fbc0db by Peter Wu (peter@xxxxxxxxxxxxx):

    conversion: do not free conversation memory on updates
    
    In commit 4afd70d ("Use g_hash_table_new_full to free some values"), the
    hashtable gained a destroy handler which frees memory. This
    inadvertently destroyed a conversation during key updates.
    
    Fix this by not calling _remove (and thereby calling the destroy
    handler), but use _steal instead. (Suggestion by Evan Huus).
    
    Bug: 10263
    Change-Id: I9fa7f5a697599f42894d38718b00b9c0c1b57004
    Reviewed-on: https://code.wireshark.org/review/2924
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  9b4f16a   gsmtap: do not abort if dissector is unavailable
    adds  8fbc0db   conversion: do not free conversation memory on updates


Summary of changes:
 epan/conversation.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)