1ece46dd80
Fix Coverity CID 1050089: "Explicit null dereferenced", by Move some lines of code into the if(tree != NULL) block.
...
svn path=/trunk/; revision=50665
2013-07-16 15:10:38 +00:00
18ea28c45e
Improve iec104 dissector. Bug 8849 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849 )
...
1) Decoding type 70 - End of initialization
2) Decoding qualifier of interrogation for type 100
3) Table of data length for all object types => checking length on one place
4) Setting correct number of selected bytes for IOA
From Jiří Engelthaler
svn path=/trunk/; revision=50664
2013-07-16 14:01:45 +00:00
3baf637267
Allow to perform sequence analysis when only RLC headers are logged
...
svn path=/trunk/; revision=50663
2013-07-16 12:28:33 +00:00
ff868427ef
Include merge.h, so it shows up in the distribution tarball.
...
svn path=/trunk/; revision=50662
2013-07-16 04:10:25 +00:00
44e4c933de
Fix warning: cannot optimize possibly infinite loops. There was no actual infinite loop, but the intended loop iteration count could have been wrong due to the implicit "mod 256" when previously assigning a value to a guint8.
...
svn path=/trunk/; revision=50661
2013-07-16 03:34:04 +00:00
86147047f5
Fix one that got missed.
...
svn path=/trunk/; revision=50660
2013-07-16 03:16:26 +00:00
9d3cda266b
Revert r50655 for this file.
...
svn path=/trunk/; revision=50659
2013-07-16 03:04:47 +00:00
f2e1a979fa
Add in basic error checking of the .proto_tree_input file to prevent some issues with updated dissector.
...
svn path=/trunk/; revision=50658
2013-07-16 02:59:16 +00:00
3dbade2423
g711.c and u3.c are now in wsutil.
...
svn path=/trunk/; revision=50657
2013-07-16 02:54:45 +00:00
0a669967fa
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
...
svn path=/trunk/; revision=50656
2013-07-16 02:35:33 +00:00
d331c33b4f
This should fix warning: to be safe all intermediate pointers in cast from 'gchar **' to 'const char **' must be 'const' qualified.
...
svn path=/trunk/; revision=50655
2013-07-16 02:34:44 +00:00
56735f8c16
Move u3.{h,c} and g711.{h,c} into wsutil.
...
Project g711.h against multiple inclusion and add C++ compatibility wrapper.
svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
69eb477c9e
Fix warning: ISO C90 forbids specifying subobject to initialize.
...
svn path=/trunk/; revision=50653
2013-07-16 02:00:53 +00:00
a430b138e9
Replace glib memory with wmem. Fixes a substantial memory leak in the TCP
...
dissector (potentially several megabytes for a large capture).
Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8459
svn path=/trunk/; revision=50652
2013-07-16 01:57:30 +00:00
df77b38e6e
Bail in the profinet heuristics if we don't have source and destination mac
...
addresses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8904
svn path=/trunk/; revision=50651
2013-07-16 01:42:26 +00:00
2d30d5beb1
Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
...
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).
svn path=/trunk/; revision=50650
2013-07-16 01:16:50 +00:00
e4bb300667
A better method of avoiding the "ISO C restricts enumerator values to range of 'int'" warning.
...
svn path=/trunk/; revision=50649
2013-07-16 01:14:40 +00:00
3e8b8f0b1a
Explain that we don't have to worry about fixed-length buffers whose
...
size is based on the snapshot length.
svn path=/trunk/; revision=50647
2013-07-16 00:18:55 +00:00
a39e5b9b4a
On the suggestion of Cal Turney, via
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8937
Don't warn if a file has packets larger than the global snapshot length.
svn path=/trunk/; revision=50646
2013-07-15 23:58:47 +00:00
1c50729f9f
Use PIE_CFLAGS when building qt-shark, since otherwise I get errors like:
...
/usr/include/qt5/QtCore/qglobal.h:1079:4: error: #error "You must build your
code with position independent code if Qt was built with -reduce-relocations. "
"Compile your code with -fPIC or -fPIE."
There is almost certainly a better way to do this: I'm cheating here because I
don't know enough about autofoo, and it seems to work. I suspect we should be
checking PIE for the C++ compiler separately (since presumably they're not
guaranteed to be related like gcc/g++ are). I also suspect we should only be
building with it in the first place if Qt really needs it, though I have no idea
how to check that. The qt docs I've found suggest that qt5's cmake module has a
flag for it, but autofoo is never mentioned...
svn path=/trunk/; revision=50645
2013-07-15 23:50:43 +00:00
66f7521a17
Revert r50150. I suspect the problem was Ubuntu's transition to qt5 as default,
...
since now the defaults work as they should.
svn path=/trunk/; revision=50644
2013-07-15 23:47:11 +00:00
54ee8a0f9a
Don't compare a guint32 against -1, compare it against 0xFFFFFFFFU.
...
svn path=/trunk/; revision=50643
2013-07-15 22:27:58 +00:00
3cd6045421
Get rid of "win-setup.sh: line 24: $'\r': command not found" warning
...
svn path=/trunk/; revision=50642
2013-07-15 22:02:12 +00:00
42a3ceea66
Fix warning: ISO C restricts enumerator values to range of 'int'
...
svn path=/trunk/; revision=50641
2013-07-15 21:53:52 +00:00
e37533ced7
Fix warnings: comma at end of enumerator list.
...
svn path=/trunk/; revision=50640
2013-07-15 21:37:55 +00:00
1c19a0d61e
Fix warnings: format '%blah' expects argument of type 'foo', but argument 'i' has type 'bar' [-Wformat].
...
svn path=/trunk/; revision=50639
2013-07-15 21:22:34 +00:00
f5f20fa8e3
Fix warning: ISO C does not allow extra ';' outside of a function.
...
svn path=/trunk/; revision=50638
2013-07-15 20:42:57 +00:00
49051b18d1
Fix warning: ISO C does not support %n$ operand number formats.
...
svn path=/trunk/; revision=50637
2013-07-15 20:29:36 +00:00
946b736de2
Set the menuRole for actionCaptureOptions to NoRole similar to
...
actionEditConfigurationProfiles. This keeps it from being converted to
the default preferences item on OS X.
Remove a hack where we stored the text for
actionEditConfigurationProfiles in its iconText in order to keep it from
clobbering actionEditPreferences. It doesn't seem to be necessary.
svn path=/trunk/; revision=50636
2013-07-15 20:17:17 +00:00
b71a5aa351
Expand the big comment about launching browsers.
...
svn path=/trunk/; revision=50635
2013-07-15 19:26:21 +00:00
49b642ab1c
Fix bug #8934 : Fuzz failure: seg-fault in tvb_new_proxy()
...
It is possible to have NULL reassembly data, support this case in tvb_new_proxy().
svn path=/trunk/; revision=50634
2013-07-15 18:59:42 +00:00
fec836d697
Fix bug #8936 : Fuzz failure: attempt to allocate -1 bytes from packet-bacapp.c and/or tvb_generic_clone_offset_len()
...
Revert r50556: Add new function: validate_offset() which checks if offset is within bounds of tvb.
svn path=/trunk/; revision=50633
2013-07-15 18:32:11 +00:00
7c5b471584
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50632
2013-07-15 18:06:29 +00:00
4c34d30a35
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50631
2013-07-15 18:06:19 +00:00
208071629d
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50630
2013-07-15 18:06:08 +00:00
9ddfede761
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50629
2013-07-15 18:05:57 +00:00
b583443a75
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50628
2013-07-15 18:05:37 +00:00
58bf1dc4f7
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50627
2013-07-15 18:05:27 +00:00
f7f3b668ef
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50626
2013-07-15 18:05:14 +00:00
e918ee63e4
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50625
2013-07-15 18:05:04 +00:00
e48f3cd707
Use 2 Spaces indent and add modelines info
...
svn path=/trunk/; revision=50624
2013-07-15 18:04:53 +00:00
c55d2bc057
Fix warnings found by fix-encoding-args tools.(and remove some tabs also)
...
svn path=/trunk/; revision=50623
2013-07-15 18:04:43 +00:00
7614891152
Use 4 Spaces indent and add modelines info
...
svn path=/trunk/; revision=50622
2013-07-15 18:04:33 +00:00
3dd52ea2da
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50621
2013-07-15 18:04:23 +00:00
c39ca07c7e
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50620
2013-07-15 18:04:14 +00:00
2aa451859a
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50619
2013-07-15 18:04:03 +00:00
cde1b3d4bb
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50618
2013-07-15 18:03:54 +00:00
779c37aa20
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50617
2013-07-15 18:03:43 +00:00
15a785c757
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=50616
2013-07-15 18:03:33 +00:00
579b937bdf
Use "generic" tfs (tfs_set_notset)
...
svn path=/trunk/; revision=50615
2013-07-15 18:03:13 +00:00
Chris Maynard