[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/05/16 03:42 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r42407 | morriss | 2012-05-03 18:33:58 -0700 (Thu, 03 May 2012) | 14 lines
   Changed paths:
      M /trunk/epan/emem.c
 
   Partial fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221
   (emem alignment problems on SPARC) :
 
   Add the room for the pointer to the next (from r31577) *before* calculating
   the canary+pad: that way the complete allocation
   (allocation+canary_ptr+canary+pad) will end on an 8-byte boundary (as was the
   case before r31577).
 
   This only solves the alignment problem when using canaries (i.e., not, by
   default, se_ allocations).
 
   (And, yes, this is ignoring the 16-byte alignment requirements of long
   doubles.)
   ------------------------------------------------------------------------
   r42431 | morriss | 2012-05-04 14:56:32 -0700 (Fri, 04 May 2012) | 15 lines
   Changed paths:
      M /trunk/configure.in
      M /trunk/epan/emem.c
      M /trunk/epan/emem.h
 
   The rest of the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221
   (emem alignment problems on SPARC) :
 
   Have emem use 8-byte alignment when we need it.
 
   Since I can't seem to write code that which reliably (across GCC versions and
   optimization levels) determines if 8-byte alignment is needed for doubles,
   "when" is defined as "if we're compiling for a CPU other than i386."
 
   Windows doesn't need a check because it's either i386 or 64-bit (x86_64 or
   maybe ia64--both of which get 8-byte alignment from G_MEM_ALIGN).
 
   (And, yes, all of this is ignoring the 16-byte alignment requirements of long
   doubles.)
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r42393 | cmaynard | 2012-05-02 18:48:59 -0700 (Wed, 02 May 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-icmp.c
      M /trunk/epan/dissectors/packet-icmp.h
      M /trunk/epan/dissectors/packet-icmpv6.c
      M /trunk/ui/cli/tap-icmpstat.c
      M /trunk/ui/cli/tap-icmpv6stat.c
 
   From Klaus Heckelmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7221: Avoid wireshark crash on platforms where an 8 byte alignment is required by changing the resp_time field in the icmp_transaction_t from a double to an nstime_t.
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path               Action
  +5 -3      packet-icmp.c      Modified
  +1 -1      packet-icmp.h      Modified
  +5 -3      packet-icmpv6.c    Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +4 -3      emem.c        Modified
  +14 -2     emem.h        Modified

Directory: /trunk-1.6/
  Changes    Path                Action
  +16 -0     configure.in        Modified
  +8 -7      tap-icmpstat.c      Modified
  +8 -7      tap-icmpv6stat.c    Modified