Wireshark-commits: [Wireshark-commits] master-2.4 1c66174: enip: use wmem for copied addresses

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 06 Dec 2018 14:43:58 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1c66174ec7aa19e2ddc79178cf59f15a654fc4fe
Submitter: "Pascal Quantin <pascal.quantin@xxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

1c66174 by Martin Kaiser (wireshark@xxxxxxxxx):

    enip: use wmem for copied addresses
    
    When we copy an address from pinfo into connInfo->O2T.ipaddress, a
    shallow copy is not sufficient. connInfo->O2T.ipaddress is kept across
    packets whereas pinfo is valid only for the current packet.
    
    Use wmem with file scope for the copied address. This fixes a
    use-after-free error when we access the address in a subsequent packet.
    
    Bug: 14470
    Change-Id: I8b74037020189485485a506af6510cb45828e3c4
    Reviewed-on: https://code.wireshark.org/review/26248
    Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 177962a5b4a05759b40fb6fc07a4a6eec306a9bf)
    Reviewed-on: https://code.wireshark.org/review/30941
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  f898da5   text2pcap: extend snap length
     add  1c66174   enip: use wmem for copied addresses


Summary of changes:
 epan/dissectors/packet-enip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)