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

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

Commits:

d2727ec by Guy Harris (guy@xxxxxxxxxxxx):

    Don't pass NULL to wtap_block_set_string_option_value().
    
    To remove OPT_SHB_HARDWARE, use wtap_block_remove_option().
    
    To get the string value from a GString, use g_string_free(string,
    FALSE), not g_string_free(string, TRUE) - the latter will free the
    string value and return NULL.
    
    Change-Id: I0c5a9f818543f6752f455f04fb3c024208e23954
    Reviewed-on: https://code.wireshark.org/review/16567
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  52323b2   Remove more string option value null checks.
    adds  d2727ec   Don't pass NULL to wtap_block_set_string_option_value().


Summary of changes:
 wiretap/merge.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)