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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=268fd52d0be8492a9804d97b2b7262c41f4eca03
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

268fd52 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    FTAM: get rid of an evil global variable
    
    Fixes an ASAN failure reported by Alexis
    
    Change-Id: Id0ddad6451e22ffc53d42985e9b2071c7388d15b
    Reviewed-on: https://code.wireshark.org/review/7049
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 29be26c4b3b387027abcab3c859643f0ee12e5cf)
    Conflicts:
    	epan/dissectors/packet-ftam.c
    Reviewed-on: https://code.wireshark.org/review/7054
    

Actions performed:

    from  8b33b38   DNS: LOC Precision missing units
    adds  268fd52   FTAM: get rid of an evil global variable


Summary of changes:
 asn1/ftam/ftam.cnf               |   18 ++++++++++-----
 asn1/ftam/packet-ftam-template.c |    1 -
 epan/dissectors/packet-ftam.c    |   45 +++++++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 27 deletions(-)