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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=13221904228eedc6d75455433fb7beb77ab30cba
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

1322190 by Bill Meier (wmeier@xxxxxxxxxxx):

    Fix Bug #10238: Display filter expression dialog items do not expand/display properly.
    
        Unfortunately, certain proto_hier_tree_model.c functions
        assume/require that a cookie generated by
        proto_(first|next)_protocol_field() will never have a NULL value.
    
        Bug introduced in gd47ae54.
    
    Change-Id: I42763d02f700e15ca9b3ab9980943d4f8d933ca9
    Reviewed-on: https://code.wireshark.org/review/2712
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    (cherry picked from commit 9cf40b67b258616c248569b74685693f14a0aab3)
    Reviewed-on: https://code.wireshark.org/review/2715
    

Actions performed:

    from  1d08bee   GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS dissector
    adds  1322190   Fix Bug #10238: Display filter expression dialog items do not expand/display properly.


Summary of changes:
 epan/proto.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)