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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5a0657686b0d91c9cedac244772351771f6d5147
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

5a06576 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Register the dicom dissector by name so it can be used with SSL.
    
    Bug: 10450
    Change-Id: I786de3de39c6d4829135b67a64936c28757d1ff4
    Reviewed-on: https://code.wireshark.org/review/4038
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 412662afb3c404df5a1e5e19988b0df8d594267a)
    Reviewed-on: https://code.wireshark.org/review/4055
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    

Actions performed:

    from  3131847   packet-sip.c: col_...() functions must not be called under 'if(...tree)' (even indirectly).
    adds  5a06576   Register the dicom dissector by name so it can be used with SSL.


Summary of changes:
 epan/dissectors/packet-dcm.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)