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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=309a847f5e91c28428c744a9c4a6e2abb686b280
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

309a847 by Peter Wu (peter@xxxxxxxxxxxxx):

    Fix duplicate Display Filter Macro check
    
    Since commit 4a1bd75b60171d781dc9f2d3ffd6d498acc74b1a
    (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471), the data
    pointer does not match anything from the macros array.
    
    This patch fixes a false warning by checking for duplicates before the
    name is committed.
    
    Bug: 10957
    Change-Id: I5e90240614774cfb2977f0b90fd3d48dc5428076
    Reviewed-on: https://code.wireshark.org/review/7119
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/7209
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  2cd23a4   CMIP: get rid of some evil global variables
    adds  309a847   Fix duplicate Display Filter Macro check


Summary of changes:
 epan/dfilter/dfilter-macro.c |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)