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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0181b47d4a03dd1851bfcc895f59799a35ec65d2
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

0181b47 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Ensure to have a valid string pointer when writing OS SHB option
    
    Change-Id: Ib0b6dcdf1700e88383d30bf43739312fce10e1c7
    Reviewed-on: https://code.wireshark.org/review/16696
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 4713ce4476cadb2d4a8869dd2e6f19547841aa9a)
    Reviewed-on: https://code.wireshark.org/review/16700
    

Actions performed:

    from  b9a7fc1   WBXML: limit the recursion level
    adds  0181b47   Ensure to have a valid string pointer when writing OS SHB option


Summary of changes:
 ui/gtk/file_import_dlg.c       |    7 ++++++-
 ui/tap_export_pdu.c            |    7 ++++++-
 wiretap/merge.c                |    9 +++++++--
 wiretap/nettrace_3gpp_32_423.c |    7 ++++++-
 4 files changed, 25 insertions(+), 5 deletions(-)