Wireshark-commits: [Wireshark-commits] master-1.10 21d146c: FTAM: get rid of an evil global variabl
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 10 Feb 2015 13:40:36 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=21d146c5f61515f99e597c4c2d11ea077cddb415
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

21d146c 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:
    	asn1/ftam/ftam.cnf
    	epan/dissectors/packet-ftam.c
    Reviewed-on: https://code.wireshark.org/review/7055
    

Actions performed:

    from  3cb88f8   [Automatic manuf, services and enterprise-numbers update for 2015-02-08]
    adds  21d146c   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(-)