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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d4f7bbb73ab98d0c51498abddc311328db18a2ba
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

d4f7bbb by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    Lua: getting fieldinfo.value for FT_NONE causes assert
    
    Retrieving an FT_NONE field's value through `fieldinfo.value` or
    `fieldinfo()` causes an assert.  It should retrieve the label instead.
    
    Conflicts:
    	epan/wslua/wslua_field.c
    
    Bug: 10815
    Change-Id: Ia80443f3dd046b2cc31d1dff70d599e96d6f6fe3
    Reviewed-on: https://code.wireshark.org/review/6150
    Petri-Dish: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Tested-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    (cherry picked from commit 0bf38f7aec22a1a6e4acfbfec4a9a2201fd6f8de)
    Reviewed-on: https://code.wireshark.org/review/6188
    

Actions performed:

    from  d1559a1   Welcome in 2015
    adds  d4f7bbb   Lua: getting fieldinfo.value for FT_NONE causes assert


Summary of changes:
 epan/wslua/wslua_field.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)