Wireshark-commits: [Wireshark-commits] master-2.2 bede749: prefs: fix crash with -o column.foo:x
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: Sun, 7 Aug 2016 12:38:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bede749b7dfdc3eb417c77ef1089fcd673ac2026
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

bede749 by Peter Wu (peter@xxxxxxxxxxxxx):

    prefs: fix crash with -o column.foo:x
    
    The gui.column module is somehow special, it has no name since it is
    part of the gui module. This causes a crash when trying to invoke
    `strcmp(module->name /* NULL */, "mgcp")`.
    
    Always look up prefs inside gui_column_module when the given prefs
    module is "column" instead of matching two specific names.
    
    Change-Id: I47e354d11b6fd01818b0627a249b506a8f9510cc
    Reviewed-on: https://code.wireshark.org/review/16937
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 1ea6b4fe2e4b6e068694301c4ffc731e2309c797)
    Reviewed-on: https://code.wireshark.org/review/16938
    

Actions performed:

    from  ace007b   checklicenses.py: Whitelist some plaintext files without license requirements
    adds  bede749   prefs: fix crash with -o column.foo:x


Summary of changes:
 epan/prefs.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)