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

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

Commits:

114d051 by Guy Harris (guy@xxxxxxxxxxxx):

      Fix crash when doing "tshark -2 -r file -w newfile".
      
      We were using cf->buf in some places and a local variable buf in others;
      consistenly use the local variable.
      
      Have a local variable for the struct wtap_pkthdr while we're at it; with
      some work we may be able to get rid of the struct wtap_pkthdr and the
      Buffer in the capture_file structure.
      
      Change-Id: I4762e22e11ef576be6bf9015450d1a270dd3d16b
      Reviewed-on: https://code.wireshark.org/review/178
      Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
      

Actions performed:

      from  6487694   Fix a Qt version comparison.
      adds  114d051   Fix crash when doing "tshark -2 -r file -w newfile".


Summary of changes:
 tshark.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)