Wireshark · Wireshark-commits: [Wireshark-commits] rev 46231: / /trunk-1.6/docbook/: release-notes.xml /trunk-1.6/epan/: radius_dic

[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46231

User: gerald
Date: 2012/11/27 10:00 AM

Log:
 Copy over fixes for bug 7803 from the trunk:
 
   ------------------------------------------------------------------------
   r45354 | eapache | 2012-10-06 13:47:35 -0700 (Sat, 06 Oct 2012) | 6 lines
   Changed paths:
      M /trunk
      M /trunk/epan/radius_dict.l
 
   Work around bug 7803 by not freeing the old name value until after it's been
   replaced in the key-set of the hash table. This doesn't really provide proper
   behaviour, it just stops us from accessing freed memory.
 
   Also, add modelines.
   ------------------------------------------------------------------------
   r45359 | eapache | 2012-10-06 16:56:56 -0700 (Sat, 06 Oct 2012) | 6 lines
   Changed paths:
      M /trunk
      M /trunk/epan/radius_dict.l
 
   Clean up better if we can't open a radius dictionary included by another
   radius dictionary. One of many issues with the way we load radius
   dictionaries.
 
   Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7803
   ------------------------------------------------------------------------
   r45360 | eapache | 2012-10-06 17:06:21 -0700 (Sat, 06 Oct 2012) | 7 lines
   Changed paths:
      M /trunk
      M /trunk/epan/radius_dict.l
 
   Don't destroy the in-memory radius dictionary if we hit a parse error:
    - If it's something as simple as a missing $INCLUDE then we probably still want
    whatever we could parse
    - We weren't doing it consistently anyways
    - There were a whole bunch of places where we were using it regardless of
    whether or not the parse failed, leading to read-after-free errors.
   ------------------------------------------------------------------------
   r45361 | eapache | 2012-10-06 18:15:16 -0700 (Sat, 06 Oct 2012) | 4 lines
   Changed paths:
      M /trunk
      M /trunk/epan/radius_dict.l
 
   Clean up properly when we can't find a radius $INCLUDE regardless of the
   state of errno. Don't treat it as a fatal parse error because it isn't,
   so we keep parsing the rest of the dictionaries even if one is missing.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +6 -0      release-notes.xml    Modified

Directory: /trunk-1.6/epan/
  Changes    Path             Action
  +36 -61    radius_dict.l    Modified