[jake@xxxxxxxxxxxxx]

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

User: jake
Date: 2011/12/16 02:55 PM

Log:
 ------------------------------------------------------------------------
 r39719 | stig | 2011-11-02 21:06:40 +0100 (Wed, 02 Nov 2011) | 1 line
 
 Revert revision 39665 (for bug 6472) which introduced bug 6537.
 ------------------------------------------------------------------------
 r39744 | stig | 2011-11-06 18:39:13 +0100 (Sun, 06 Nov 2011) | 6 lines
 
 From Robert G. Jakabosky via bug 5575:
 Fix memory errors in Lua dissectors.
 - Free Tvb when created from ByteArray.
 - Free TvbRange correctly.
 - Free string from get_persconffile_path and get_datafile_path.
 - Some code cleanup.
 ------------------------------------------------------------------------
 r39748 | stig | 2011-11-07 08:41:03 +0100 (Mon, 07 Nov 2011) | 4 lines
 
 Do not return from within a TRY/CATCH/ENDTRY because this will make the
 except stack invalid, and will lead to a crash.
 
 In this case it was when calling a dissector from a table in a Lua script.
 ------------------------------------------------------------------------
 r39749 | stig | 2011-11-07 17:09:41 +0100 (Mon, 07 Nov 2011) | 4 lines
 
 Do not return from within a TRY/CATCH/ENDTRY because this will make the
 except stack invalid, and will lead to a crash.
 
 In this case it was when doing compare functions on a FT_PROTOCOL.
 ------------------------------------------------------------------------
 r39777 | guy | 2011-11-10 01:53:48 +0100 (Thu, 10 Nov 2011) | 8 lines
 
 prefs_reset() has to reset the dissector preferences to their defaults,
 as we don't save to a preferences file preference values that are equal
 to their defaults, so if you change profiles, a preference that has a
 non-default value in the old profile and a default value in the new
 profile, so that it's *not* in the preference file for the new profile,
 will not be set to the right value unless we reset all protocol
 preferences to their defaults first.
 
 ------------------------------------------------------------------------
 r39779 | etxrab | 2011-11-10 07:07:16 +0100 (Thu, 10 Nov 2011) | 3 lines
 
 From Dirk:
 CAPWAP dissector tries to allocate -1 bytes of memory during reassembly.
 - changed to return offset.
 ------------------------------------------------------------------------
 r39999 | alagoutte | 2011-11-25 11:38:15 +0100 (Fri, 25 Nov 2011) | 3 lines
 
 From Dagobert Michelsen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6615
 Do not return value on void function in epan/dissectors/packet-capwap.c
 
 ------------------------------------------------------------------------
 
 
 
 Applied by hand:
 
 ------------------------------------------------------------------------
 r39754 | alagoutte | 2011-11-08 15:45:35 +0100 (Tue, 08 Nov 2011) | 3 lines
 
 From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
 80211 QoS Control: Add Raw TID
 
 ------------------------------------------------------------------------

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                  Action
  +5 -1      packet-capwap.c       Modified
  +10 -0     packet-ieee80211.c    Modified

Directory: /trunk-1.4/epan/
  Changes    Path          Action
  +99 -2     prefs.c       Modified

Directory: /trunk-1.4/epan/ftypes/
  Changes    Path              Action
  +38 -54    ftype-tvbuff.c    Modified

Directory: /trunk-1.4/gtk/
  Changes    Path                  Action
  +2 -10     dfilter_expr_dlg.c    Modified

Directory: /trunk-1.4/epan/wslua/
  Changes    Path              Action
  +1 -0      init_wslua.c      Modified
  +2 -0      wslua.h           Modified
  +2 -1      wslua_dumper.c    Modified
  +13 -10    wslua_proto.c     Modified
  +56 -12    wslua_tvb.c       Modified
  +5 -3      wslua_util.c      Modified