Wireshark-commits: [Wireshark-commits] master-2.0 baad089: g_mallocate the encrypted key, but free

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 20:45:40 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=baad08926d427414beef771bbd7c6d226f640f67
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

baad089 by Guy Harris (guy@xxxxxxxxxxxx):

    g_mallocate the encrypted key, but free it in all paths out of the function.
    
    It doesn't need to persist after the function returns.
    
    Change-Id: Ic601a6ef6a0aa0f22f9c8b9a1c586cec95093f27
    Reviewed-on: https://code.wireshark.org/review/12805
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 6ede7d4ba3d7acaf90846618afd0830a57511b64)
    Reviewed-on: https://code.wireshark.org/review/12806
    

Actions performed:

    from  8d8b560   [airpdcap rijndael] use packet scoped wmem memory in AES_unwrap()
    adds  baad089   g_mallocate the encrypted key, but free it in all paths out of the function.


Summary of changes:
 epan/crypt/airpdcap.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)