Wireshark-commits: [Wireshark-commits] master-3.0 9f421e4: asn2wrs.py: fix parsing of integer union
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: Thu, 24 Oct 2019 04:40:47 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9f421e4f7c9a047234c81738a6931011a2d128d5
Submitter: "Jaap Keuter <jaap.keuter@xxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

9f421e4 by Pascal Quantin (pascal@xxxxxxxxxxxxx):

    asn2wrs.py: fix parsing of integer unions with extension
    
    When parsing the description
    ExpectedActivityPeriod ::= INTEGER (1..30|40|50|60|80|100|120|150|180|181,...)
    asn2wrs.py was generating some code where the has_extension flag was
    wrongly set to false, leading to a decoding error.
    
    Bug: 16145
    Change-Id: I0d54994c0656f5b48f3dcd1864218c45a4ebc308
    Reviewed-on: https://code.wireshark.org/review/34837
    Petri-Dish: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    (cherry picked from commit eb4e83d5891165ca1f958cf57641200a8cb5a0b4)
    Conflicts:
    	epan/dissectors/packet-ngap.c
    Reviewed-on: https://code.wireshark.org/review/34848
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    

Actions performed:

    from  76f3c58   3.0.6 → 3.0.7.
     add  9f421e4   asn2wrs.py: fix parsing of integer unions with extension


Summary of changes:
 epan/dissectors/packet-ngap.c | 4 ++--
 epan/dissectors/packet-s1ap.c | 4 ++--
 epan/dissectors/packet-x2ap.c | 4 ++--
 epan/dissectors/packet-xnap.c | 4 ++--
 tools/asn2wrs.py              | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)