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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a9396c6c8dd5d047dab6dc31049d41918cd2bb2c
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

a9396c6 by Joerg Mayer (jmayer@xxxxxxxxx):

    Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL.
    
    This fixes the first issue appearing in the log of
    
    Bug: 13418
    Change-Id: I2fe68a06dd4a19be8300ec34be65a8dc47d0f8b3
    Reviewed-on: https://code.wireshark.org/review/20214
    Reviewed-by: Jörg Mayer <jmayer@xxxxxxxxx>
    (cherry picked from commit b82f7c5b7d30241dd190cd243111b224c2813c90)
    Reviewed-on: https://code.wireshark.org/review/20237
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  98004d7   Qt: Handle cancel in import coloring rules
    adds  a9396c6   Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL.


Summary of changes:
 ui/qt/remote_capture_dialog.cpp |    2 +-
 ui/recent.c                     |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)