Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master-2.4 6ca4515: If we're reading from a string, don't fc

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 03 Apr 2018 01:04:56 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6ca4515aec8f9bdf61bb7c25311a9b425a7ee101
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.4
Repository: wireshark

Commits:

6ca4515 by Guy Harris (guy@xxxxxxxxxxxx):

    If we're reading from a string, don't fclose yyin.
    
    yyin is initialized to stdin.  When we're reading from files, we set it
    so that it points to the FILE from which we're reading, but when we're
    reading from a string, we don't set it, leaving it to point to stdin.
    
    This means that, just as the "read from the input" routine has to be set
    differently when reading from a file or a string, the "close the current
    input" routine has to be set differently as well.
    
    Bug: 14577
    Change-Id: Ie05880775612867e9037ace2de0cd0a0dd2fabb5
    Reviewed-on: https://code.wireshark.org/review/26719
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 9d87f607ee2ecefaff71f2ab3f2dc3d2dc185399)
    Reviewed-on: https://code.wireshark.org/review/26721
    

Actions performed:

    from  956dd8c   [Automatic update for 2018-04-01]
    adds  6ca4515   If we're reading from a string, don't fclose yyin.


Summary of changes:
 epan/diam_dict.l | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)