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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4f49cb4010ab6c8133d932e70aa41d4b9a425621
Submitter: "Stig Bjørlykke <stig@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

4f49cb4 by Martin Boye Petersen (martinboyepetersen@xxxxxxxxx):

    Qt: Add null check for finfo and hfinfo
    
    Adding the null check fixes a bug that made wireshark crash
    when right clicking a subtree which doesn't have any preferences
    and if none of the parents had one either.
    
    The problem was introduced in commit 589413d8772f1450be9bd4a2550cb99a95f71299
    
    Change-Id: Ia5bbae0a58298f3e9d912e44f33589da1cbfacc9
    Reviewed-on: https://code.wireshark.org/review/29455
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    (cherry picked from commit 3aa7e61b17a39be4ec0674f9933a07172df0e712)
    Reviewed-on: https://code.wireshark.org/review/29461
    

Actions performed:

    from  bd4759b   PER: fix dissection of enumerated type with a single extension value
     add  4f49cb4   Qt: Add null check for finfo and hfinfo


Summary of changes:
 ui/qt/proto_tree.cpp              | 3 ++-
 ui/qt/utils/field_information.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)