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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6e67016ffa07c50bd8bdd562746328f5c2abd895
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

6e67016 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Fix the uninitialized-read error reported in bug 10370.
    
    Fix apparent cut-n-pasteo: if offset_e is set then we should be looking
    at offset_e (instead of offset_s) and ts_end (instead of ts_start).
    
    Bug: 10370
    Change-Id: I0683ad55ac782c7fd03b7dbdf3f34df713267de5
    Reviewed-on: https://code.wireshark.org/review/3589
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    (cherry picked from commit 44698259b1f5865c60323acaf2a633654a2abe81)
    Reviewed-on: https://code.wireshark.org/review/3591
    (cherry picked from commit 2035d31c0e7cb7291ede2544a04b4641dc9b12d7)
    Reviewed-on: https://code.wireshark.org/review/3592
    

Actions performed:

    from  5130847   [Automatic manuf, services and enterprise-numbers update for 2014-08-10]
    adds  6e67016   Fix the uninitialized-read error reported in bug 10370.


Summary of changes:
 epan/dissectors/packet-netflow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)