Wireshark-commits: [Wireshark-commits] master-2.2 608befb: xmpp/xml: Store item length in xml_frame
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 26 Aug 2016 07:18:23 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=608befbe71df4b5b716d80057e803164f62c6c21
Submitter: Stig Bjørlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

608befb by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    xmpp/xml: Store item length in xml_frame.
    
    The created XML proto_item can be faked (if not visible and not referenced),
    so ensure we store the correct item length to be used in XMPP.
    
    This will avoid an invalid "Malformed Packet" for some XMPP packets.
    
    Change-Id: I79d805b725dbeb93f26a38b72bdcc84187aee16f
    Reviewed-on: https://code.wireshark.org/review/17324
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit ce9a4b212ec7b75985cef3b9ab362808e6fd25c5)
    Reviewed-on: https://code.wireshark.org/review/17338
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  c84ce03   Handle ETH_P_CANFD as well as ETH_P_CAN.
    adds  608befb   xmpp/xml: Store item length in xml_frame.


Summary of changes:
 epan/dissectors/packet-xml.c        |    7 +++++++
 epan/dissectors/packet-xml.h        |    1 +
 epan/dissectors/packet-xmpp-utils.c |   17 +++--------------
 3 files changed, 11 insertions(+), 14 deletions(-)