Wireshark-commits: [Wireshark-commits] master-1.12 0a84d89: Always free the decrypted key in AirPDc

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 21 Dec 2015 21:01:10 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0a84d89dfbf8f4f07a797effe5a31203b6c24aca
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

0a84d89 by Guy Harris (guy@xxxxxxxxxxxx):

    Always free the decrypted key in AirPDcapDecryptWPABroadcastKey().
    
    If we've allocated it, free it before we return, even if we return an
    error.
    
    Also, zero it out when we allocate it.
    
    Change-Id: I105671074ea007720c0038ec897be7702f486783
    Reviewed-on: https://code.wireshark.org/review/12810
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  0dcd9b1   g_mallocate the encrypted key, but free it in all paths out of the function.
    adds  0a84d89   Always free the decrypted key in AirPDcapDecryptWPABroadcastKey().


Summary of changes:
 epan/crypt/airpdcap.c          |    2 ++
 epan/crypt/airpdcap_rijndael.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)