Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK.
Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90
Reviewed-on: https://code.wireshark.org/review/6799
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Fixes "Conditional jump or move depends on uninitialised value" from Valgrind.
I couldn't really figure out how this code was supposed to function, it seems to
initialize one member of the union and then expect *all* the others to just
magically work (which they apparently do in most cases, oddly). The real bug
could be in csnStreamDissector or who knows, but this at least turns "garbage
data" into "zeros" which makes valgrind happy and turns a potential vuln into
at worst a bad decoding.
Bug: 10891
Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3
Reviewed-on: https://code.wireshark.org/review/6769
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b
Reviewed-on: https://code.wireshark.org/review/6786
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2
Reviewed-on: https://code.wireshark.org/review/6788
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e
Reviewed-on: https://code.wireshark.org/review/6787
Reviewed-by: Michael Mann <mmann78@netscape.net>
Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs;
continue to support --get-svn and --set-svn as aliases, for backwards
compatibility. Change variable names as well.
Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27
Reviewed-on: https://code.wireshark.org/review/6783
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That makes it more VCS-neutral - apparently some people maintain private
versions under VCSes other than Git, and make-version.pl still handles
those VCSes.
Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4
Reviewed-on: https://code.wireshark.org/review/6779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Lua-created tvbuffs should be kept around for the duration of pinfo's
lifetime, instead of only for the duration of frame dissection. So
instead of using the frame dissector's frame_end_routine, we'll register
a callback to wmem for pinfo pool's allocator.
Bug: 10888
Change-Id: I3e9db671c3f2a7cab9e258aca17f3be8acaf2417
Reviewed-on: https://code.wireshark.org/review/6768
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
Including:
Remove dead initializers;
Remove boilerplate comments;
Localize some variables;
tvb_length...() ==> tvb_reported_length...();
Use TRUE/FALSE when assigning a value to a gboolean;
whitespace/indentaion.
Change-Id: I09e1f15611011bbe393d23e1cb54568ddd3cebc6
Reviewed-on: https://code.wireshark.org/review/6771
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Create/use extended value strings
tvb_length...() --> tvb_reported_length...()
Cleanup:
Remove some dead initializers;
Declare some vars as 'const' (initialized value is never changed);
localize some vars;
whitespace;
Change-Id: Iee21bb67fb42b1160b8ba2b7c2b89b410cc22225
Reviewed-on: https://code.wireshark.org/review/6770
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Apparently some compilers do sufficient inlining optimization to notice that
there's at least one caller of rtps_util_add_typecode which passes an
indent_level of 0. Such compilers are *also* picky enough to complain about
memset being called with a length of 0, leading to a warning which we turn into
a compile error.
I thought about putting in an "if indent_level > 0" but I figure memsetting the
entire buffer (length >= 1) is simpler and more efficient in the common case.
Change-Id: Ica21ba988eb0c1251e7b4ef2e110336d5ee32837
Reviewed-on: https://code.wireshark.org/review/6766
Reviewed-by: Evan Huus <eapache@gmail.com>
Fix errors found by American Fuzzy Lop's afl-gcc
(http://lcamtuf.coredump.cx/afl/):
peektagged.c:
error: 'fileVersion' may be used uninitialized in this function
packet-h223.c:
error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork'
wslua_proto.c:
error: variable 'd' might be clobbered by 'longjmp' or 'vfork'
wslua_proto.c:
error: variable 'dt' might be clobbered by 'longjmp' or 'vfork'
Change-Id: Idd74a3ad7b236d3a8756c1e7e917b1c74143f381
Reviewed-on: https://code.wireshark.org/review/6767
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Create DATAFILE_DIR when we're building an application bundle. Hopefully
this will fix the build error on the OS X x86 builder.
Change-Id: I57414bcd87ab21958ae8131a8cd77951b29e02f7
Reviewed-on: https://code.wireshark.org/review/6763
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Setting the windowIcon property in foo.ui means we end up with a
setWindowIcon call in ui_foo.h. Along with setting the window title
bar icon, it also sets the taskbar icon on Windows. A 16x16 PNG gives
us a jaggy taskbar icon. (Windows ICO format is supported via a plugin
which might not be available everywhere, otherwise we could try using
a .ico resource.)
Move the setWindowIcon call from ge990d1b to the top of the MainWindow
constructor and enable it everywhere.
Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870
Reviewed-on: https://code.wireshark.org/review/6762
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
We should probably do the same for the other decryption tests but we're
having issues with HTTP2 right now.
Change-Id: I8e8f5da200a29a5ca1cddb39c082bb7ee12d1eaf
Reviewed-on: https://code.wireshark.org/review/6686
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Using little endian for encoding
Ping-Bug: 10786
Change-Id: Ic2a7f52ccbba32a801c102df4e5aa0a792654602
Reviewed-on: https://code.wireshark.org/review/6755
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Based from FortiAP/WiFi 5.2.x
Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519
Reviewed-on: https://code.wireshark.org/review/5646
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The header field info variable named hfi_netlink_len isn't registered
by the netlink dissector, but is added to the tree, resulting in a
runtime error. This commit changes the variable name slightly, to
be more accurate, and correctly registers it.
Bug: 10884
Change-Id: Iaa4e556d5bbe87b72a0cdca2fbf397fa95e074cc
Reviewed-on: https://code.wireshark.org/review/6751
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The format of the API chapter was a bit screwed up, as was the
indentation level of attributes. Also, some functions introduced
in 1.11.3 were not documented as being since that version.
Change-Id: I7912488c6da5b5ae72933e4c5ce49f8fbf0b0e34
Reviewed-on: https://code.wireshark.org/review/6753
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Incorrect because of one or both of the following:
- col_...()/expert...() called under 'if (tree)'
- vars set under 'if (tree)' used later (not under 'if (tree)'
as args to col_...()/expert_...()
Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de
Reviewed-on: https://code.wireshark.org/review/6754
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Lua prior to 5.3 defined luaL_{check,opt}int() as macros wrapping
luaL_{check,opt}integer() with a cast to int; Lua 5.3 doesn't.
It sounds as if the Lua developers are deprecating luaL_{check,opt}int():
http://osdir.com/ml/general/2014-10/msg46568.html
Change-Id: I2d0b649dcd57ede124f31d39f7945f342ae9b18f
Reviewed-on: https://code.wireshark.org/review/6744
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
In oid_encoded2subid_sub(), the scope we get may be NULL, in which case if we
don't return our allocated buffer, it is our responsibility to free it. Minor
regression from ge333e4c90f0aca41b0a56cef22fd80d0b0e73e14.
Bug: 10883
Change-Id: I324ca770278ab0575511c5e9ab72b70d6ac1a391
Reviewed-on: https://code.wireshark.org/review/6748
Reviewed-by: Evan Huus <eapache@gmail.com>
The test script was running lua/nstime.lua rather than lua/pinfo.lua for
the Pinfo test, and the Pinfo test was testing the ipproto property for
a Pinfo, but that was removed.
Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e
Reviewed-on: https://code.wireshark.org/review/6747
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It's 2 byte only so we need to use tvb_get_letohs().
Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6710
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This will be able to hold also SMB2 file ids and maybe other stuff in future.
Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6708
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
There's nothing special about LUA_VERSION when it comes to the user
overriding it - they'd do that by changing it, the same as with any
other _VERSION variable. Remove the comment about it, which is now out
of date in any case.
Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc
Reviewed-on: https://code.wireshark.org/review/6739
Reviewed-by: Guy Harris <guy@alum.mit.edu>
offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.
Bug:10877
Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Categories 063 and 065 were decoded only partially. Now the dissector
dissects all the items in these two categories.
Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
Reviewed-on: https://code.wireshark.org/review/6714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
If, for a package, the version specified by the _VERSION variable
doesn't match the version installed (as indicated by a -done file),
un-install it, and remove the downloaded version, before doing any
installs, so that the specified version replaces the installed version.
Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4
Reviewed-on: https://code.wireshark.org/review/6736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Bill Meier