aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tvbuff_composite.c
AgeCommit message (Collapse)AuthorFilesLines
2016-11-13tvbuff_composite.c: fix composite_get_ptr when length is over 2 segmentsPascal Quantin1-2/+2
When storing a copy of the composite tvb in tvb->real_data, ensure to copy the full data and not only the length currently requested by the call to tvb_get_ptr() Change-Id: I6b42f3d46c4fba83fadf4d06f465c8d2486f4853 Reviewed-on: https://code.wireshark.org/review/18806 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-05-31Fix display of composite tvbs in GUIPascal Quantin1-2/+5
a composite tvb is the top-level data source tvb fix composite_get_ptr function Change-Id: Ibab58801a754fd88fb86b9a13804bccf2ad51c7a Reviewed-on: https://code.wireshark.org/review/15643 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-22tvbuff_composite.c: do not recompute abs_lengthPascal Quantin1-5/+0
abs_length is already computed by the caller of composite_get_ptr (ensure_contiguous_no_exception). No need to do the work another time Change-Id: I93edd6d405b2d5afe99dc7c781ecea4b395ef7bd Reviewed-on: https://code.wireshark.org/review/15053 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22Do not mix wmem and glib allocatorsPascal Quantin1-1/+7
Change-Id: I0e845668a1b9dbec93ea920a8585ecfe60f001d1 Reviewed-on: https://code.wireshark.org/review/15044 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-24Remove deprecated tvb_length callsEvan Huus1-1/+1
Trust that the files in epan/ immediately (not dissectors) know what they're doing so just blindly convert them to captured length. Change-Id: I872f7d58b2e15ae82c75fd56f4873996fbc97be7 Reviewed-on: https://code.wireshark.org/review/9083 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris1-2/+0
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 Reviewed-on: https://code.wireshark.org/review/6635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-04tvbuff composite: add modelines infos (tabs)Alexis La Goutte1-0/+13
Change-Id: I9ea2160b550243b45f6798ad3339f6a45b34a4ef Reviewed-on: https://code.wireshark.org/review/3991 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-04tvbuff composite: fix Dereference of null pointer found by Clang AnalyzerAlexis La Goutte1-0/+3
Change-Id: Ia43cb2e1cab99e4b769c8dfa0805d8e38e225a1c Reviewed-on: https://code.wireshark.org/review/3990 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-09-22emem -> wmem conversion:Pascal Quantin1-1/+1
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
2013-09-21Add _g_ to the names of functions that allocate glib memory. This is a bit moreEvan Huus1-1/+1
explicit, and frees up the "generic" names (like tvb_memdup) for new signatures that take the appropriate wmem pool. Majority of the conversion done with sed. svn path=/trunk/; revision=52164
2013-09-13Explicitly include emem.h where it is neededJörg Mayer1-0/+2
svn path=/trunk/; revision=51997
2013-08-20Composite tvb (tvb_memcpy/tvb_get_ptr): don't assert with offset == ↵Jakub Zawadzki1-2/+12
tvb->length, and 0 length svn path=/trunk/; revision=51444
2013-08-04Cleanup tvbJakub Zawadzki1-7/+2
- make tvb_ops->tvb_size a gsize field, not function call - remove not needed forward declaration / forward line svn path=/trunk/; revision=51141
2013-07-31Move tvbuff composite structure to their own file.Jakub Zawadzki1-0/+17
svn path=/trunk/; revision=51072
2013-07-31Move composite tvbuff to seperate file (with some subtle changes).Jakub Zawadzki1-0/+275
svn path=/trunk/; revision=51071