[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c557bb0910be271e49563756411a690a1bc53ce5
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

c557bb0 by Dario Lombardo (lomato@xxxxxxxxx):

    rpcap: check conversation existence before dereferencing it.
    
    Conflicts:
    	epan/dissectors/packet-rpcap.c
    
    Bug: 15536
    Change-Id: I370b7f4b3f647243490cbfadc120f0198c62b09b
    Reviewed-on: https://code.wireshark.org/review/32232
    Petri-Dish: Dario Lombardo <lomato@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 2f048c932d0c063bd53651d0fd8f31a66eede741)
    Reviewed-on: https://code.wireshark.org/review/32236
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  342c628   MS Proxy: Initialize a variable.
     add  c557bb0   rpcap: check conversation existence before dereferencing it.


Summary of changes:
 epan/dissectors/packet-rpcap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)