------------------------------------------------------------------------
r43950 | gerald | 2012-07-23 17:26:28 -0700 (Mon, 23 Jul 2012) | 2 lines
Changed paths:
   M /trunk-1.6/config.nmake
   M /trunk-1.6/configure.in
   M /trunk-1.6/debian/changelog
   M /trunk-1.6/debian/wireshark-common.files
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/Makefile.am
   M /trunk-1.6/make-version.pl
   M /trunk-1.6/version.conf
   M /trunk-1.6/wiretap/Makefile.am

1.6.9 → 1.6.10.

------------------------------------------------------------------------
r44077 | gerald | 2012-07-27 13:02:30 -0700 (Fri, 27 Jul 2012) | 3 lines
Changed paths:
   M /trunk-1.6/packaging/nsis/wireshark.nsi

r42858 switched to the OBS GTK+ bundle but missed a lot of important
"ifdef NEED_xxx_DLL" stanzas. Add them.

------------------------------------------------------------------------
r44078 | gerald | 2012-07-27 13:18:35 -0700 (Fri, 27 Jul 2012) | 2 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml

Add a note about missing DLLs.

------------------------------------------------------------------------
r44105 | gerald | 2012-07-29 08:04:32 -0700 (Sun, 29 Jul 2012) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2012-07-29]
------------------------------------------------------------------------
r44120 | wmeier | 2012-07-29 14:32:56 -0700 (Sun, 29 Jul 2012) | 32 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-nfs.c

Copy over from trunk:
------------------------------------------------------------------------
r44111 | wmeier | 2012-07-29 14:17:17 -0400 (Sun, 29 Jul 2012) | 11 lines

Fix crash when "file_name_snooping" & "file_full_name_snooping" prefs enabled.

Crash due to a g_snprintf() incorrect (too large) "max number of bytes" parameter.

Note that g_snprintf() apparently writes to (initializes ?) bytes beyond the
 actual string written.

Fixes Bug #7948: (To be confirmed by the user)
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7498


------------------------------------------------------------------------
r44112 | wmeier | 2012-07-29 15:00:46 -0400 (Sun, 29 Jul 2012) | 2 lines

Cast away a compile warning: "conversion from '__int64' to 'gulong', possible loss of data"

------------------------------------------------------------------------
r44113 | wmeier | 2012-07-29 15:05:18 -0400 (Sun, 29 Jul 2012) | 2 lines

Fix a typo  :(

------------------------------------------------------------------------
r44117 | wmeier | 2012-07-29 16:19:38 -0400 (Sun, 29 Jul 2012) | 2 lines

g_assert --> DISSECTOR_ASSERT

------------------------------------------------------------------------

------------------------------------------------------------------------
r44278 | gerald | 2012-08-05 08:04:37 -0700 (Sun, 05 Aug 2012) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2012-08-05]
------------------------------------------------------------------------
r44310 | gerald | 2012-08-07 12:33:24 -0700 (Tue, 07 Aug 2012) | 16 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-dcp-etsi.c

Copy over r44247 from the trunk:

  ------------------------------------------------------------------------
  r44247 | morriss | 2012-08-03 09:20:31 -0700 (Fri, 03 Aug 2012) | 6 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-dcp-etsi.c

  Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7566 :

  Don't try to reassemble a message of length 0 (fixes a later divide-by-zero
  error but I don't see why we'd want to do any work for message whose length
  we think is 0).
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r44344 | gerald | 2012-08-08 09:13:26 -0700 (Wed, 08 Aug 2012) | 21 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-xtp.c

Copy over r44289 from the trunk:

  ------------------------------------------------------------------------
  r44289 | gerald | 2012-08-06 16:12:13 -0700 (Mon, 06 Aug 2012) | 10 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-xtp.c

  Add a maximum span length check to XTP. Fixes a crash discovered by Ben
  Schmidt.

  Just use proto_tree_add_item() instead of allocating a
  big-ol-honkin'-block of guint64s and adding their values to the tree via
  proto_tree_add_uint64().

  Dissection *should* still work correctly but I can't find any XTP
  captures for testing.
  ------------------------------------------------------------------------

Update the release notes.


------------------------------------------------------------------------
r44351 | gerald | 2012-08-08 10:32:01 -0700 (Wed, 08 Aug 2012) | 15 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-afp.c

Copy over r44317 with manual intervention:

  ------------------------------------------------------------------------
  r44317 | gerald | 2012-08-07 16:06:29 -0700 (Tue, 07 Aug 2012) | 5 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-afp.c

  Fix a large loop found by Stefan Cornelius of Red Hat Security Response
  Team (bug 7603).

  Display the ACL entry count as decimal instead of hexadecimal.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r44354 | gerald | 2012-08-08 11:46:00 -0700 (Wed, 08 Aug 2012) | 18 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-rtps2.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r44320 | gerald | 2012-08-07 17:40:03 -0700 (Tue, 07 Aug 2012) | 7 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-rtps2.c

  Use ep_strbufs instead of trying to track string offsets manually
  and overflowing a buffer. Fixes a crash in bug 7568 discovered by
  Laurent Butti.

  We do the Dance Of The String Offset Pointers in several other
  places. They should probably be changed to ep_strbufs as well.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r44357 | gerald | 2012-08-08 12:39:15 -0700 (Wed, 08 Aug 2012) | 5 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-gsm_rlcmac.h

Copy over the fix for bug 7561 from r44307+r44319 by hand. I can't trigger the
bug in 1.6 but there's still a union member / data structure size mismatch.

Update the release notes.

------------------------------------------------------------------------
r44361 | gerald | 2012-08-08 14:17:58 -0700 (Wed, 08 Aug 2012) | 5 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-cip.c

Copy over the fix for bug 7570 from r44312 by hand. The problem isn't as severe
in 1.6 but it's still there.

Update the release notes.

------------------------------------------------------------------------
r44368 | gerald | 2012-08-08 17:30:22 -0700 (Wed, 08 Aug 2012) | 14 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-stun.c

Copy over r44366 from the trunk:

  ------------------------------------------------------------------------
  r44366 | gerald | 2012-08-08 17:20:18 -0700 (Wed, 08 Aug 2012) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-stun.c

  se_tree_lookup32_array() can destroy its key. Make sure we refresh it
  before passing it to se_tree_insert32_array(). Fixes bug 7569 reported
  by Laurent Butti.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r44391 | gerald | 2012-08-09 10:46:55 -0700 (Thu, 09 Aug 2012) | 17 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/plugins/ethercat/packet-ecatmb.c

Copy over r43149 from the trunk with manual intervention:

  ------------------------------------------------------------------------
  r43149 | wmeier | 2012-06-07 13:16:28 -0700 (Thu, 07 Jun 2012) | 6 lines
  Changed paths:
     M /trunk/plugins/ethercat/packet-ecatmb.c

  Attempt to fix display of "eoe macfilter header".
  Among other things: fix incorrect 'display' value in several hf[] entries.
  (See XXX coments in source for further details).
  Attempt to fix use of incorrect value in hf[] entry 'display' fields
  ------------------------------------------------------------------------

Fixes an abort reported by Laurent Butti in bug 7562.

Update the release notes.

------------------------------------------------------------------------
r44405 | gerald | 2012-08-09 15:19:14 -0700 (Thu, 09 Aug 2012) | 13 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-ctdb.c

Copy over r44403 with manual intervention:

  ------------------------------------------------------------------------
  r44403 | gerald | 2012-08-09 15:04:46 -0700 (Thu, 09 Aug 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-ctdb.c

  Add a check for the number of nodes. Fixes a DoS in bug 7573 reported by
  Ben Schmidt.
  ------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r44432 | gerald | 2012-08-10 11:32:21 -0700 (Fri, 10 Aug 2012) | 49 lines
Changed paths:
   M /trunk-1.6/asn1/x2ap/packet-x2ap-template.c
   M /trunk-1.6/asn1/x2ap/x2ap.cnf
   M /trunk-1.6/docbook/release-notes.xml
   M /trunk-1.6/epan/dissectors/packet-gsm_a_common.c
   M /trunk-1.6/epan/dissectors/packet-x25.c
   M /trunk-1.6/epan/dissectors/packet-x2ap.c
   M /trunk-1.6/gtk/menus.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r42564 | guy | 2012-05-11 00:38:59 -0700 (Fri, 11 May 2012) | 5 lines
  Changed paths:
     M /trunk/asn1/x2ap/packet-x2ap-template.c
     M /trunk/asn1/x2ap/x2ap.cnf
     M /trunk/epan/dissectors/packet-x2ap.c

  Get rid of remaining Booleans-as-encoding-arguments in
  proto_tree_add_item() calls.

  Fix a field that was presumably intended to be of type FT_IPv6.
  ------------------------------------------------------------------------
  r43956 | etxrab | 2012-07-24 04:47:23 -0700 (Tue, 24 Jul 2012) | 6 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-x25.c

  From Karsten Keil:
  ISDN LAPD X.31 packet traffic can not be decoded

  X.31 is X.25 over ISDN. It use SAPI 16 LAPD service.

  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7514
  ------------------------------------------------------------------------


Copy over by hand:

  ------------------------------------------------------------------------
  r44008 | pascal | 2012-07-25 13:04:33 -0700 (Wed, 25 Jul 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-gsm_a_common.c

  Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7524 :
  8-PSK structure in GSM Classmark 3 is not properly dissected
  ------------------------------------------------------------------------
  r44103 | alagoutte | 2012-07-29 07:51:43 -0700 (Sun, 29 Jul 2012) | 4 lines
  Changed paths:
     M /trunk/ui/gtk/main_menubar.c

  It is link Tshark Help not Wireshark (already in bottom !)

  #BACKPORT
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r44453 | gerald | 2012-08-12 08:04:34 -0700 (Sun, 12 Aug 2012) | 1 line
Changed paths:
   M /trunk-1.6/epan/enterprise-numbers
   M /trunk-1.6/manuf
   M /trunk-1.6/services

[Automatic manuf, services and enterprise-numbers update for 2012-08-12]
------------------------------------------------------------------------
r44504 | gerald | 2012-08-14 14:01:18 -0700 (Tue, 14 Aug 2012) | 2 lines
Changed paths:
   M /trunk-1.6/docbook/release-notes.xml

Add CVE IDs.

------------------------------------------------------------------------
r44507 | gerald | 2012-08-14 14:43:14 -0700 (Tue, 14 Aug 2012) | 34 lines
Changed paths:
   M /trunk-1.6/epan/dissectors/packet-btl2cap.c
   M /trunk-1.6/epan/dissectors/packet-fclctl.c
   M /trunk-1.6/epan/dissectors/packet-lisp.c
   M /trunk-1.6/epan/dissectors/packet-sctp.c
   M /trunk-1.6/epan/sctpppids.h

Copy over r44500 from the trunk:

  ------------------------------------------------------------------------
  r44500 | tuexen | 2012-08-14 13:31:49 -0700 (Tue, 14 Aug 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-sctp.c
     M /trunk/epan/sctpppids.h

  Update SCTP PPIDs.
  This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635
  ------------------------------------------------------------------------


Copy over with manual intervention:

  ------------------------------------------------------------------------
  r44476 | gerald | 2012-08-13 12:30:42 -0700 (Mon, 13 Aug 2012) | 3 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-btl2cap.c

  Add length checks to make sure we don't underflow an integer. Make
  sure we allocate and copy the same amount of data. Fixes bug 7621.
  ------------------------------------------------------------------------
  r44491 | mmann | 2012-08-14 09:29:38 -0700 (Tue, 14 Aug 2012) | 1 line
  Changed paths:
     M /trunk/epan/dissectors/packet-fclctl.c
     M /trunk/epan/dissectors/packet-lisp.c

  fix subtle g_strdup_printf() memory leaks with ephemeral memory
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
