Wireshark-commits: [Wireshark-commits] master-2.2 e4e12df: Don't pick up junk from an unset error-n
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 15 Sep 2016 22:22:30 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e4e12dfda276a0f2e737e25f388f2464587eb7c7
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

e4e12df by Guy Harris (guy@xxxxxxxxxxxx):

    Don't pick up junk from an unset error-number variable.
    
    Keep the actual error code and pointer-to-error-string in the scanner
    state, rather than pointers to the variables passed in to us.
    Initialize them to 0 and NULL, respectively.
    
    That way, when the actual scanner routine returns, we don't check for an
    error by looking at the error variable pointed to by our argument, which
    might not have been set by the scanner and might have stack junk in it,
    we look at a structure member we set to 0 before the scan.
    
    Bug: 12903
    Change-Id: I5a382da569a226e60c3c2a47f3a1515b0490c31d
    Reviewed-on: https://code.wireshark.org/review/17716
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 7a7d162a494e3ccf15f58f1d710dcf645cfa02b1)
    Reviewed-on: https://code.wireshark.org/review/17717
    

Actions performed:

    from  aeaf427   eap: fix EAPOL conversation tracking, fixes TLS decryption
    adds  e4e12df   Don't pick up junk from an unset error-number variable.


Summary of changes:
 wiretap/k12text.l |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)