Wireshark · Wireshark-commits: [Wireshark-commits] master d438170: Fix a mis-merging.

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

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

Commits:

d438170 by Guy Harris (guy@xxxxxxxxxxxx):

    Fix a mis-merging.
    
    Also, remove the "make sure we're not fetching a bogus structure" tests.
    
    Add a comment explaining how a compiler bug where it's overly optimizing
    a combination of tests could cause the valgrind errors we were seeing,
    so we're zeroing the entire structure, padding included, to avoid that.
    
    Change-Id: I24f94b2cbceec5234c1da82b891f609648075839
    Reviewed-on: https://code.wireshark.org/review/19149
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  a02d8e3   tns: reduce variable scope.
    adds  d438170   Fix a mis-merging.


Summary of changes:
 epan/dissectors/packet-cops.c |   38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)