Wireshark · Wireshark-commits: [Wireshark-commits] master d108f28: zigbee: fix two memory leaks

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d108f2871c285646aa16f76bf635a36e096b9b05
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d108f28 by Martin Kaiser (wireshark@xxxxxxxxx):

    zigbee: fix two memory leaks
    
    ==17992== 4 bytes in 1 blocks are definitely lost in loss record 68 of 4,102
    ==17992==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
    ==17992==    by 0x9FB2F30: g_malloc (gmem.c:159)
    ==17992==    by 0x9FC89E5: g_memdup (gstrfuncs.c:384)
    ==17992==    by 0x703F977: dissect_zbee_aps (packet-zbee-aps.c:1300)
    ==17992==    by 0x67B4F1E: call_dissector_through_handle (packet.c:618)
    
    ==17992== 8 bytes in 1 blocks are definitely lost in loss record 580 of 4,102
    ==17992==    at 0x4C272B8: calloc (vg_replace_malloc.c:566)
    ==17992==    by 0x9FB2F88: g_malloc0 (gmem.c:189)
    ==17992==    by 0x703F962: dissect_zbee_aps (packet-zbee-aps.c:1299)
    ==17992==    by 0x67B4F1E: call_dissector_through_handle (packet.c:618)
    
    second version that uses glib memory routines and does not mix
    g_hash_table and wmem
    
    remove an obsolete comment and an unnecessary return; while at it
    
    Change-Id: I2e92db0613f01b6c3009e8ad82ceb65a87cba12e
    Reviewed-on: https://code.wireshark.org/review/9830
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  c462f1b   Eliminate proto_tree_add_text from packet-wbxml.c
    adds  d108f28   zigbee: fix two memory leaks


Summary of changes:
 epan/dissectors/packet-zbee-aps.c |   11 +----------
 epan/dissectors/packet-zbee-nwk.c |   11 ++++++++---
 2 files changed, 9 insertions(+), 13 deletions(-)