Public Git Hosting - wireshark.git/log

MIME based pcapng dissector: Fixup apparent copy-and-pasteos.

The MIME based pcapng dissector incorrectly displayed the EPB
Flags option's link layer error bits.

Change-Id: Ia14eec39e2a9c4432e6b3d1c0cee718ad2da1cac
Reviewed-on: https://code.wireshark.org/review/23279
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 6d5fcb7378b89790ab2d3feac0a6579c59b97bef)
Reviewed-on: https://code.wireshark.org/review/23289
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Prep for 2.0.15.

Change-Id: I2b7caad8c5ecde43e387c38289a406d05e0a7edf
Reviewed-on: https://code.wireshark.org/review/23270
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Lua: fix crash on invalid Dissector.list("food") invocation

The Dissector.list, Listener.list and Field.list functions do not accept
a parameter. Passing one however results in a crash because the first
element is not the expected table, but the first function parameter.

Change-Id: I8483d0aa20716045472f30f5b41a449bed549b05
Reviewed-on: https://code.wireshark.org/review/23209
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
(cherry picked from commit f3ba318e099f62aea51718b73e8e817482beab51)
Reviewed-on: https://code.wireshark.org/review/23235

[Automatic update for 2017-08-27]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I9c448935bb92540009d94b579a92bd3294586268
Reviewed-on: https://code.wireshark.org/review/23227
Reviewed-by: Gerald Combs <gerald@wireshark.org>

IrCOMM: check string length before appending it to item

Bug: 13929
Change-Id: I33f3fec77014949fcc15df72c42ffcb25158562f
Reviewed-on: https://code.wireshark.org/review/22887
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>
(cherry picked from commit c9cb01adbb24c91b665c6c219573f8ee96e1986c)
Reviewed-on: https://code.wireshark.org/review/23212
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Update WinSparkle to 0.5.6.

Change-Id: Ib0f981bdf4579af8549450bb14b694253e9694e7
Reviewed-on: https://code.wireshark.org/review/23181
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic update for 2017-08-20]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I94cab26a4a92892042c4f7b95bd3a3471fcd0582
Reviewed-on: https://code.wireshark.org/review/23144
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic update for 2017-08-13]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I9b869462714c1fd2590cfa70d7ccb14352023ea0
Reviewed-on: https://code.wireshark.org/review/23059
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic update for 2017-08-06]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I945b1b4875ed49cff365e48e0824dd9f868594ea
Reviewed-on: https://code.wireshark.org/review/22964
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Lua: Check for PseudoHeader.none

Don't dereference pointer when using PseudoHeader.none.

Bug: 13944
Change-Id: I4e509269ac4983531912f3f9b2cc6b7cf00fbeae
Reviewed-on: https://code.wireshark.org/review/22945
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
(cherry picked from commit 15c0c8db5e0aac50e44eb3e2cd6eb5c0b3585220)
Reviewed-on: https://code.wireshark.org/review/22952

Lua: Fix error message in Dumper:dump()

Change-Id: I9cdf8ecaf5129a30091b9b4d109f70cfdd7fca1b
Reviewed-on: https://code.wireshark.org/review/22946
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
(cherry picked from commit 4b4ce9fb35a46447796252cbfd1af4ea6b889d55)
Reviewed-on: https://code.wireshark.org/review/22949

Note that newer versions of various distributions won't have these problems.

Change-Id: Ib5f0d9ffe4a2a574c5cc2299271d3c5f9828dede
Reviewed-on: https://code.wireshark.org/review/22914
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit c5569cfa0b985b763608231fe4b2fc976422aa33)
Reviewed-on: https://code.wireshark.org/review/22917

macosx-setup.sh doesn't build Qt, it just installs a binary.

Say it builds "as needed".

Change-Id: I85ce2062da7f168785d0d22160b8f19b85d554e3
Reviewed-on: https://code.wireshark.org/review/22909
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 778117c502d9e702327f592784c8d7b94212302c)
Reviewed-on: https://code.wireshark.org/review/22912

Qt+Windows: Make Wireshark explicitly DPI-unaware.

Set dpiAware=false in Wireshark's manifest. This has the effect of scaling
up and pixelating the UI on displays that have font scaling enabled. It's
not pretty but it's much more readable, at least on a test machine here.

Change-Id: I9e141d885ae1bd6cbd207f95b7fc414c8106b21a
Reviewed-on: https://code.wireshark.org/review/22899
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix calls to dissect_msdp().

Change-Id: I4ac32df8cb959ea8e7e3a586c0eacbf2f0c2c27d
Reviewed-on: https://code.wireshark.org/review/22884
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Do more checks for extra data at the end of a TLV.

Change-Id: I013b21184f8e539d194b6d7ad880e50674958f32
Reviewed-on: https://code.wireshark.org/review/22874
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 7e03e6b4eae2cc5871dda97462d1d43ec4b975b5)
Reviewed-on: https://code.wireshark.org/review/22877

Clean up MSDP dissection.

It's now an RFC; mention the RFC number.

There are no message types in MSDP; the message consists solely of a
sequence of TLVs. Don't speak of TLV types as message types.

When dissecting a TLV, don't go past the end of the TLV. (We should add
a bunch of expert infos for length errors.)

Note that the Notification TLV was in an I-D but isn't in the RFC.

Don't use tvb_new_subset() - tvb_new_subset_length() suffices; let *it*
check for the captured length.

Clean up dissection of the Notification TLV.

Bug: 13933
Change-Id: Ia39b98f061957085c9f15fe6b31cd9c18058df35
Reviewed-on: https://code.wireshark.org/review/22868
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 33b95883aa4ef7391c05e563243992d35846a633)
Reviewed-on: https://code.wireshark.org/review/22870
(cherry picked from commit 5ade15dbd675ff88ea177173bf373bfff26bba44)
Reviewed-on: https://code.wireshark.org/review/22871

[Automatic update for 2017-07-30]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I9f36591b417b15a5d7eb0075af246bb6e3966a88
Reviewed-on: https://code.wireshark.org/review/22857
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Windows: fix generation with CMake 3.9.0

By using CMake FindPerl.cmake module, CYGWIN_INSTALL_PATH variable
gets overwritten, bypassing our modified FindCygwin.cmake.
Let's package our own version FindPerl.cmake to avoid this.

Bug: 13922
Change-Id: If68e96ba312c2c6fa417721e7aec2ae6e5179a81
Reviewed-on: https://code.wireshark.org/review/22834
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 76762d69b55065af69df075ca8bd3425b5b3ca84)
Reviewed-on: https://code.wireshark.org/review/22845
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

[Automatic update for 2017-07-23]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I013c621bbe85453d31cee9ef0dad29e75149bee1
Reviewed-on: https://code.wireshark.org/review/22764
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Give some references.

Change-Id: Iaa4912fa50ffde8d5408527f3b4b28a0d2a56cde
Reviewed-on: https://code.wireshark.org/review/22737
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 3669a8cc8f64a1874a3d370abccfc6e815b46514)
Reviewed-on: https://code.wireshark.org/review/22740

CMake: Escape shell command quotes.

Escape shell command quotes so that what appears to be "unquoted_legacy"
behavior doesn't kick in.

Ping-Bug: 12305
Change-Id: I4763df2fbc58b80d6e4e3ec15f78c16fa1cf3853
Reviewed-on: https://code.wireshark.org/review/22732
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit ab0b3ecf867223d8aeeb9c405dfc7204114b0dbe)
Reviewed-on: https://code.wireshark.org/review/22736

Update WinSparkle.

Change-Id: I08cee1ba13495b077fea2bd42fdfc2d762405c3a
Reviewed-on: https://code.wireshark.org/review/22724
Reviewed-by: Gerald Combs <gerald@wireshark.org>

2.0.14 → 2.0.15.

Change-Id: Iadf788785c572d9a62bbe4c06f82fee60d60ce10
Reviewed-on: https://code.wireshark.org/review/22705
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 2.0.14.

Change-Id: Id103d6b7cfc7b850e908f252ceac9e45cd5442d1
Reviewed-on: https://code.wireshark.org/review/22701
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Prep for 2.0.14.

Change-Id: If869241874c1d741aad8e8198193eaf497ed0bda
Reviewed-on: https://code.wireshark.org/review/22682
Reviewed-by: Gerald Combs <gerald@wireshark.org>

OpenSafety: sanity check calculated length.

Original sanity check was missed for fragmentation

Bug: 13755
Change-Id: If9e24e01a119c869b02f198456776c8e6c6f2ad0
Reviewed-on: https://code.wireshark.org/review/22193
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: Roland Knall <rknall@gmail.com>
(cherry picked from commit 66c50585e5c10764d0b8a850fd49fa7012346560)
Reviewed-on: https://code.wireshark.org/review/22680
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic update for 2017-07-16]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ia88592416ced2d27684b6b389ce1adeedec67976
Reviewed-on: https://code.wireshark.org/review/22650
Reviewed-by: Gerald Combs <gerald@wireshark.org>

UMTS RLC: check rlc_channel_assign return value when searching duplicates

Bug: 13871
Change-Id: Id28d73115b557af96c23154a18dcee502b4305ed
Reviewed-on: https://code.wireshark.org/review/22520
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 9ff673d3e85590141a6f0e33c9521de91512094d)
Conflicts:
epan/dissectors/packet-umts_rlc.c
Reviewed-on: https://code.wireshark.org/review/22527

UMTS FP: do not try to compute CRC on payload when no payload is present

A call to tvb_memdup() with a 0 length triggers a UBSan warning

Change-Id: I6c99ef85050cd2219d2135f64f747961a8be6927
Ping-Bug: 13871
Reviewed-on: https://code.wireshark.org/review/22521
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>
(cherry picked from commit 02f66afd64753c6b177ba21c46bdf938d682afe4)
Reviewed-on: https://code.wireshark.org/review/22524

Revert "dumpcap: fix minor memory leak at begin of capture"

This reverts commit 4b40cee433172d061e45c9ddfdadae50bfbdcd10.

There's no cpu_info_str to *be* leaked in this branch.

Change-Id: I83af74b00a5903eeefb2af0510ee1341f337f094
Reviewed-on: https://code.wireshark.org/review/22492
Reviewed-by: Guy Harris <guy@alum.mit.edu>

dumpcap: fix minor memory leak at begin of capture

While "os_info_str" is freed after the loop, "cpu_info_str" was leaked.

Change-Id: Ia4069403c0a5dd5cc6bd7ed61726c1bfa9736b19
Reviewed-on: https://code.wireshark.org/review/22465
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 247446539704aee99f64e73a77e5e88a40ae885a)
Reviewed-on: https://code.wireshark.org/review/22470

Clean up the "non-constant initalizers" stuff.

We aren't, in this branch, insisting on C99 on UN*X, so we still warn
against initializing aggregates, even if they have automatic storage
duration, with non-constant values. Put that into its own section, with
some details, and take that out of the section on initializing global
and static variables with non-constant values.

(In practice, it'll probably Just Work, but we haven't pulled any of the
*other* C99isms into this branch, and this branch is soon going to be
less active once 2.4 is out, so we'll just leave the restrictions in.)

For the latter section, expand the example in the hopes of avoiding
confusion between "static storage duration" (which something declared
"static" has, but which anything declared with file scope, whether
declared "static" or not, also has) and "static storage duration and
internal linkage", which is what the "static" keyword specifies.

Change-Id: I5a7d307f0cb3be84e355b92231fb115359d0cd41
Reviewed-on: https://code.wireshark.org/review/22436
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 0930fe4cffc3f9b4a8ef9168a72fdb05c8f1bcb8)
Reviewed-on: https://code.wireshark.org/review/22437

Fix the "don't initialize with non-constant variables" item.

It only applies to variables with static storage duration, i.e. global
and static variables. Expand the example of how to do it, to make it a
bit clearer.

Change-Id: Ie0c473a35a77351dd10d6c9df2c34a39f077fca4
Reviewed-on: https://code.wireshark.org/review/22430
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 7321df2a4532d6531eab75f99c5f158ffd90574b)
Reviewed-on: https://code.wireshark.org/review/22433

Don't check for inflatePrime() on Windows.

On Windows, we build libz as part of the Wireshark build process, so we
don't necessarily *have* a libz library to search or inflatePrime() at
this point; the search fails on the buildbots, for example.

So, on Windows, we just assume we have a new enough version of libz, so
that it has inflatePrime().

Bug: 13850
Change-Id: Ied0909f4a591ff3312d83a2a2ed41e3cd12218e8
Reviewed-on: https://code.wireshark.org/review/22413
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 9a1d16b55324056e4d5031370b007097b76dc519)
Reviewed-on: https://code.wireshark.org/review/22416

[Automatic update for 2017-06-25]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I67970f2016f4ac63a15a1815a27a0b496dcf516f
Reviewed-on: https://code.wireshark.org/review/22387
Reviewed-by: Gerald Combs <gerald@wireshark.org>

OSPF: fix Opaque LSA Type 11 is considered as unknown

it is define in RFC5250 (and RFC 2370)

Ping-Bug: 13823

Change-Id: I84f166d48b39e76ab811a6c2d1c7b1d516e7f0f3
Reviewed-on: https://code.wireshark.org/review/22328
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 0727123773d36a9dd6000d82a2967f7ddaa61aca)
Reviewed-on: https://code.wireshark.org/review/22372

Add notes about predefined strings not available to plugins

The documention refers dissector authors to helpful predifined string structures
that plugin authors unfortunately cannot use.

# Conflicts:
# doc/README.dissector

Bug: 13828
Change-Id: I62cdfeb200c9b354aed44d40c80a0e8f9e8f910b
Reviewed-on: https://code.wireshark.org/review/22339
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-on: https://code.wireshark.org/review/22343
Reviewed-on: https://code.wireshark.org/review/22344

MQ: put declaration before code

Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19
Reviewed-on: https://code.wireshark.org/review/22332
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit e46cb2defc559a530d11689d50f0adf47513e8e5)
Reviewed-on: https://code.wireshark.org/review/22335

ISIS LSP: fix wrong bitmask for SPVID

Issue reported by Bo-Han Liao

Bug: 13821
Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6
Reviewed-on: https://code.wireshark.org/review/22299
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 855484fbd98c8c01f5a84902243389e07e32b6e9)
Reviewed-on: https://code.wireshark.org/review/22302
Reviewed-by: Anders Broman <a.broman58@gmail.com>

tcp: Change the wording to include (s)

More than one packet could be meant by that

Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6
Reviewed-on: https://code.wireshark.org/review/22283
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 050da447424223d39d1e494b8daab840a100d05e)
Reviewed-on: https://code.wireshark.org/review/22297

GPRS LLC: fix a variable overflow when decoding XID

Bug: 13603
Change-Id: I135c5d6a9edff53ed4b7aa283c7293e22bd377e6
Reviewed-on: https://code.wireshark.org/review/22276
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>

MQ: check fragment length before trying to perform reassembly

Bug: 13792
Change-Id: Id0c116655288c5a3347911281a932ae80250c24f
Reviewed-on: https://code.wireshark.org/review/22233
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>
(cherry picked from commit bb58b3a2643ab81560d84b00be3a9b9e86f0393c)
Conflicts:
epan/dissectors/packet-mq.c
Reviewed-on: https://code.wireshark.org/review/22253
Reviewed-by: Michael Mann <mmann78@netscape.net>

PROFINET IO: define an arbitrary recursion depth limit

Bug: 13811
Change-Id: I52bffd4a79dcdad9da23f33e1fc6a868472390bf
Reviewed-on: https://code.wireshark.org/review/22232
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>
(cherry picked from commit fbfb87a2439dd18f2318586b8e5a2f6db410ba6a)
Reviewed-on: https://code.wireshark.org/review/22256
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

AMQP: fix a stack overflow when offset goes back and forth

Previous code assumed that list decoding was successful and that some
bytes were consumed. Let's explicitly check this.

Bug: 13780
Change-Id: I3546b093f309f2b8096f01bc9987ac5ad9e029eb
Reviewed-on: https://code.wireshark.org/review/22235
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>
(cherry picked from commit 246cbbc2ea6dd0a3a69a1aaa94db244a77565353)
Reviewed-on: https://code.wireshark.org/review/22250

DAAP: define an arbitrary recursion depth limit

Bug: 13799
Change-Id: I611e3e888f91f78262e0d685e613a2bc221687c5
Reviewed-on: https://code.wireshark.org/review/22210
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>
(cherry picked from commit 82fc557bed30b1aa69ca43a4291b64a9ce54c78a)
Conflicts:
epan/dissectors/packet-daap.c
Reviewed-on: https://code.wireshark.org/review/22231

Put the definition of BIT_SWAPPED_MAC_ADDRS in the file where it's used.

In change 18a3b0659c209a2e0121eacd640b75e6c1c3b87d, I moved the table
that uses it, but not the actual definition, from libpcap.c to
pcap-common.c; they both should have been moved. Make it so.

Change-Id: I266fce455df3848b873cdfadb12cecdbf9c8d4d3
Reviewed-on: https://code.wireshark.org/review/22216
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit e9e1b4816278a131aa38dfc579ccd975fed2d7c7)
Reviewed-on: https://code.wireshark.org/review/22219

[Automatic update for 2017-06-18]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ib19f0a1ee301aca47b4dde911150525fe8135dfa
Reviewed-on: https://code.wireshark.org/review/22206
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix SURROGATE_VALUE() to match what RFC 2781 says.

While we're at it, note in the comment for get_utf_16_string() the
"decoding UTF-16" algorithm in RFC 2781.

Change-Id: I5d7dc5c09af0474c055796e49e0c7b94fa87d2ad
Reviewed-on: https://code.wireshark.org/review/22171
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 435c68cd2b856a6be7d015e8703c6c83d9b8eb89)
Reviewed-on: https://code.wireshark.org/review/22174

packet-btrfcomm.c: Prevent over bit shift in get_le_multi_byte_value.

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2163
Bug: 13783
Change-Id: I92cefec86f9545345d00cf28e32ef7c05064417c
Reviewed-on: https://code.wireshark.org/review/22141
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>
(cherry picked from commit 552dab08a6ea1b47465d888c613c353f8697e918)
Reviewed-on: https://code.wireshark.org/review/22154
Reviewed-by: Michael Mann <mmann78@netscape.net>

WBXML: Fix some more potential infinite loops.

tvb_get_guintvar can generate some unrealistic values so do some
sanity checking on them.

Bug: 13796
Change-Id: I2d5f7a48c2e982a419ea6ab3ac0000be3b6bcbc7
Reviewed-on: https://code.wireshark.org/review/22121
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>
(cherry picked from commit 50fa2d95833ec2e2b0de3000eda7b290fc23eaeb)
Reviewed-on: https://code.wireshark.org/review/22130

DOCSIS: Prevent infinite loop from unknown FCParm.

concatlen was not updated if FCParm was unknown, leading to an infinite loop.

# Conflicts:
# plugins/docsis/packet-docsis.c

Bug: 13797
Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc
Reviewed-on: https://code.wireshark.org/review/22120
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>
(cherry picked from commit 26a6881014c85c935f2794f6eeb852849137c20a)
Reviewed-on: https://code.wireshark.org/review/22124
Reviewed-on: https://code.wireshark.org/review/22126

[Automatic update for 2017-06-11]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I2ca6804b96a3b9d464b9f951b014ac3caf2f5648
Reviewed-on: https://code.wireshark.org/review/22070
Reviewed-by: Gerald Combs <gerald@wireshark.org>

wsmp: read the message length as big endian

We add the message length to the tree as big endian but we interpret it
as little endian for our further calculations. This causes parsing
errors. Use big endian for both cases.

Bug: 13766
Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52
Reviewed-on: https://code.wireshark.org/review/22024
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit bd130766438546ab64f7540597a2e3b82cbf8a3c)
Reviewed-on: https://code.wireshark.org/review/22030
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Revert "Fix issue with dissecting multiple DT1 packets in the frame"

Bug: 13651
This reverts commit daefa86695ecb6f859615ccd1bee6269e2c568a5.

Change-Id: I50eee7ae99bc471d95365a8da0271188d826ac46
Reviewed-on: https://code.wireshark.org/review/21738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 8fd14b796055fc45f0aac0ee6d24bfb183bebe43)
Reviewed-on: https://code.wireshark.org/review/22016
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[Bssmap] Fix and improve dissection

See TS 48.008:
* in "Perform Location Request" msg, "Cell Identifier" ie is optional, not mandatory (3.2.1.71)
* in "Uplink Releae Command" msg, "Cause" ie is mandatory (3.2.1.62)
* fixed and improved "Service Handover" ie dissection (3.2.2.75)

Change-Id: I2194bf56ef21a2cccbd4f2ed7ff22565af04cddd
Reviewed-on: https://code.wireshark.org/review/21957
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>
(cherry picked from commit 795077b3ea95b1c2fb8f8cf5c6971da05a0c3ed2)
Reviewed-on: https://code.wireshark.org/review/21962

[SGsAP] Fix Release-Request msg

"SGs Cause" is an optional ie, not a mandatory one. See TS 29.118 8.23.1

Change-Id: I74ad90d159e667fa41f8c099520ce5f662a4d85e
Reviewed-on: https://code.wireshark.org/review/21939
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>
(cherry picked from commit 88cf898c4409d4267ef11eb6676cca5c8b05c435)
Reviewed-on: https://code.wireshark.org/review/21945

[Automatic update for 2017-06-04]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ib270518cf13dd3184169bed02270415f658d4e9a
Reviewed-on: https://code.wireshark.org/review/21935
Reviewed-by: Gerald Combs <gerald@wireshark.org>

TCAP: fix SRT analysis

When reviewing the code, the following issues were identified:
- otid/dtid on 3 bytes were not stored
- when receiving the first continue from dest, the TC_END hash entry was
created with the source tid / address instead of destination ones
- when receiving the first continue from src, the logic could prevent
the creation of the hash entry

Bug: 13739
Change-Id: If4ee70f0fa69f5ff74fdf75f3a741102baa0121a
Reviewed-on: https://code.wireshark.org/review/21780
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit f434820705b7875e5eaab1bba77c0264b1eb1bd6)
Conflicts:
epan/dissectors/asn1/tcap/packet-tcap-template.c
epan/dissectors/asn1/tcap/tcap.cnf
epan/dissectors/packet-tcap.c
Reviewed-on: https://code.wireshark.org/review/21898

2.0.13 → 2.0.14.

Change-Id: I52ca7078683e4927f5575e189ee840105c0c8c07
Reviewed-on: https://code.wireshark.org/review/21885
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 2.0.13.

Change-Id: Ic495ef56bb23ee17c3850339ef0d2eba5a3211ac
Reviewed-on: https://code.wireshark.org/review/21882
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Update the release notes for 2.0.13.

Change-Id: I4e1b1b9bd35d0a2af9f6b156605d3e5c6cdd7934
Reviewed-on: https://code.wireshark.org/review/21865
Reviewed-by: Gerald Combs <gerald@wireshark.org>

GTK: Bugfix not allowing extcap capture filters to be verified.

Matches Id45052f21ebb290bf92c201370584156a65f2e19

Change-Id: I2b097d176ec3ce0637af95d66d2f58b834c79ea2
Reviewed-on: https://code.wireshark.org/review/21783
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 4e05adcfb20d297d559ae787ac0fcef637d67ef3)
Reviewed-on: https://code.wireshark.org/review/21785

Qt: Fix capture filter verification for non-extcap interfaces.

Change-Id: Id45052f21ebb290bf92c201370584156a65f2e19
Reviewed-on: https://code.wireshark.org/review/21777
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 10d7e391b3c9de2ea66a46980bf2362bb79292f3)
Reviewed-on: https://code.wireshark.org/review/21782

[Automatic update for 2017-05-28]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Iaf2ad46cde0aefb702e970be404274b51cf09789
Reviewed-on: https://code.wireshark.org/review/21774
Reviewed-by: Gerald Combs <gerald@wireshark.org>

GTK: Don't allow extcap capture filters to be verified.

There isn't an API to do it and if WinPcap isn't present it can
cause a crash.

Change-Id: I5338f854acb26f0822ac027e6c853a550da3f7b1
Reviewed-on: https://code.wireshark.org/review/21758
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit d14b8f6fc5bc727355cd317197fab5b0fb349f4b)
Reviewed-on: https://code.wireshark.org/review/21763

Don't try to compile capture filter if pcap_compile isn't available.

This is most likely due to WinPcap not being installed.

Bug: 13672
Change-Id: Ic7069f98c7f8068cdc5045204c2e23ab56b3f7eb
Reviewed-on: https://code.wireshark.org/review/21757
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 9bd2b63968ecde680cdee8e8eff43e526ef178f4)
Reviewed-on: https://code.wireshark.org/review/21761
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

[Automatic update for 2017-05-21]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I3aef5fe7d0ef220dce989522ed9cf720c3046512
Reviewed-on: https://code.wireshark.org/review/21725
Reviewed-by: Gerald Combs <gerald@wireshark.org>

msnip: Verify pinfo->dst is a valid IPv4 address

Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1678
Bug: 13725
Change-Id: Ib61733200658b4cca0bb0f45e5445b0ed3c12ab0
Reviewed-on: https://code.wireshark.org/review/21712
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit b2923e93133e21f18799124eff01156088980456)
Reviewed-on: https://code.wireshark.org/review/21714
Petri-Dish: Michael Mann <mmann78@netscape.net>

SMB: Fix dissection of SMB_COM_TRANSACTION2_SECONDARY (0x33)

Issue reported by Alex
Bug: 13690
Change-Id: I6c0c01569be8474e1cbab0c8ca009c00394e1ffe
Reviewed-on: https://code.wireshark.org/review/21650
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit c30bb2c75e3291a6a676ad74ab88934ca329106f)
Reviewed-on: https://code.wireshark.org/review/21657
Petri-Dish: Michael Mann <mmann78@netscape.net>

[Automatic update for 2017-05-14]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I79d4e86a0a7eff81043094657695e2a93c043258
Reviewed-on: https://code.wireshark.org/review/21632
Reviewed-by: Gerald Combs <gerald@wireshark.org>

BT L2CAP: avoid a division by 0

Bug: 13701
Change-Id: Ie433ecd932dcfc40fa6d3fdc3fa00139c64584a2
Reviewed-on: https://code.wireshark.org/review/21618
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit d566531ae5874bfd63c2755cba95cd63b7a4a189)
Reviewed-on: https://code.wireshark.org/review/21622

dns: improve loop detection in label decompression

Previously the number of allowed pointers within a message is equal to
the data in a tvb (16575 in one example). This is still expensive, so
implement an alternative detection mechanism that looks for a direct
self-loop and limits the total pointers to about 256.

Bug: 13633
Change-Id: I803873e24ab170c7ef0b881d3bdc9dfd4014de97
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1206
Reviewed-on: https://code.wireshark.org/review/21507
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
(cherry picked from commit 129bdb5a164a6386c35ff387e9d8f0d3d6a12dbf)
Reviewed-on: https://code.wireshark.org/review/21597

[Automatic update for 2017-05-07]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I72a482d91acc968379f842fa3c4705d793195ff3
Reviewed-on: https://code.wireshark.org/review/21549
Reviewed-by: Gerald Combs <gerald@wireshark.org>

packet-dcm.c: Fix infinite loop

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1329
Bug: 13685
Change-Id: Ic70cf8185beeb4cfa9417c287cf963e1c56bf86c
Reviewed-on: https://code.wireshark.org/review/21529
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 538abdfbc2225e8c39de99811fb9cbef53b0911b)
Reviewed-on: https://code.wireshark.org/review/21535

bootp: fix potential buffer overflow (read)

The Vendor class Identifier is a string (used with strncmp). Be sure to
obtain a null-terminated string.

Bug: 13628
Change-Id: Ic6457da171fbfa1bd18366d965d22e942fb080d6
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1183
Bug: 13609
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1153
Reviewed-on: https://code.wireshark.org/review/21498
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 508bec78a39f0c7a2a54986b7616e4f615d6f170)
Reviewed-on: https://code.wireshark.org/review/21501
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Put back the null terminator in the list of handles.

The code to scan the list has always required a null terminator, but
change 96f517647a8f8b22c66eacf6e3d8bea9d8b8c68f got rid of the null
terminator.

Change-Id: I13c1553114e08e8617adaf8874ffb5e7c7c4b2d3
Reviewed-on: https://code.wireshark.org/review/21477
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 81292f3ac786578f0cadee55f16f6dfb8315b705)
Reviewed-on: https://code.wireshark.org/review/21479

packet-bzr.c: Prevent infinite loop

Bug: 13599
Change-Id: If85588099d7c6635865614f8778a903a5e971789
Reviewed-on: https://code.wireshark.org/review/21410
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>
(cherry picked from commit afb4de370a4c54e08e9367b55ae142414efc6e8f)
Reviewed-on: https://code.wireshark.org/review/21460

[Automatic update for 2017-04-30]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I42367b3972b1e46f99054b90a9e1b374a3e9df1f
Reviewed-on: https://code.wireshark.org/review/21429
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't add /usr/X11/lib/pkgconfig if we're not using GTK+.

Qt for macOS doesn't use X11, so you don't need X11.

Change-Id: Ibc09a2d802f21b5be38baf735d2f6d582d6bf41f
Reviewed-on: https://code.wireshark.org/review/21401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 5bda98586b4f81c14a5f3b8feacd10392dc0d078)
Reviewed-on: https://code.wireshark.org/review/21403

Get rid of a message that should no longer apply.

The version of pkg-config downloaded and built by macosx-setup.sh
defaults to looking in, among other places, /usr/local/lib/pkgconfig, so
you don't need to add that to PKG_CONFIG_PATH on macOS; Wireshark for
macOS no longer uses X11, so you don't need to add
/usr/X11/lib/pkgconfig to PKG_CONFIG_PATH on macOS.

Change-Id: I84fd6848b72010aafd7859c4e9c0a4362113c890
Reviewed-on: https://code.wireshark.org/review/21398
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 57b17187d5eda5dd481d1bf5c5e026866fc38e91)
Reviewed-on: https://code.wireshark.org/review/21399
(cherry picked from commit 6e652aac92207386e360ac78f001810a2cd59842)
Reviewed-on: https://code.wireshark.org/review/21400

[OpenSafety] Bugfix invalid length calculation.

Length calculation leads to -1, which will result in a large malloc

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1212
Bug: 13649
Change-Id: Iccb78b8c8ec9ca8e8f97bc12d0d8f41526d1f791
Reviewed-on: https://code.wireshark.org/review/21367
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit f6431695049116176361ce4691dfd3c77ab19858)
Reviewed-on: https://code.wireshark.org/review/21376
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

packet-rgmp.c: Ensure pinfo->dst is a valid IPv4 address

Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1243
Bug: 13646
Change-Id: I2174e79dd2a9679f099c87c55c33984aca891d22
Reviewed-on: https://code.wireshark.org/review/21368
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 3f7f131ef372ec3a22f6363ab89dcdc0fba2b377)
Reviewed-on: https://code.wireshark.org/review/21386

packet-sigcomp.c: Prevent large shift

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1232
Bug: 13641
Change-Id: I6e53d07dd03a5b637ca27884fad32ba5f7a85d0e
Reviewed-on: https://code.wireshark.org/review/21369
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit a1152a2a1f486e07e861afcc56ab0f16bb9c7a83)
Reviewed-on: https://code.wireshark.org/review/21374

packet-netsync.c: Prevent large shift

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1221
Bug: 13639
Change-Id: I0b67a270460473917f2481f79f404e4599727508
Reviewed-on: https://code.wireshark.org/review/21370
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 92903583f8373af782efe7ae64352ec1e426e35a)
Reviewed-on: https://code.wireshark.org/review/21372

ISUP: restore number indicators2 display like what was done in master-1.12

proto_tree_add_bitmask_list() should avoided as there is an interpreted field.

Bug: 13588
Change-Id: Iec6bf9bb4002123b6913fbee6287472aaf9bc00b
Reviewed-on: https://code.wireshark.org/review/21340
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>
(cherry picked from commit 821a3466c68ed509d8f71e34a62a2227823b1e55)
Reviewed-on: https://code.wireshark.org/review/21353

ieee80211: fix stack-use-after-return

Bug: 13662
Change-Id: I26c53ecc78005b26908d74877814be22924848bc
Fixes: v1.11.3-rc1-2029-g4b8b83407a ("Support for IEEE 802.11ad")
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1268
Reviewed-on: https://code.wireshark.org/review/21333
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
(cherry picked from commit bfd1461ec81311f31e9fc0f3f298ae779911c7f4)
Reviewed-on: https://code.wireshark.org/review/21338

GSM SMS: fix display of reassembled 8 bits SMS

Change-Id: I0052fb1f311f18180fbc7c6b8bd2fbf23215ad67
Reviewed-on: https://code.wireshark.org/review/21319
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit cb089dd2ff20cd7cc165de303de075bcb6be3afc)
Reviewed-on: https://code.wireshark.org/review/21323
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

slsk: fix infinite loop

If check_slsk_format reports that the buffer does not contain the
expected data, do not try to find more items (break out of the loop).

In one case, an infinite loop would occur because the index variable was
not incremented when the check fails. In all other cases, it would
perform up to 2^32 calls to check_slsk_format per loop (with the same
offset parameter, so no exception is triggered).

Change-Id: I4b7fa10a36fee2551fa46831bcecd6bcd9f342d1
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1200
Bug: 13631
Reviewed-on: https://code.wireshark.org/review/21284
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 7eab596c0824e6fa20aad6932bcd2fdb94b86edf)
[ Conflicts: manually resolved, skipped removal of "i = 0" from lines
where "j = tvb_get_letohl(...)" occurs ]
Reviewed-on: https://code.wireshark.org/review/21296
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 8525318ec4babcd946bd34c68dd2aed4d7089162)
Reviewed-on: https://code.wireshark.org/review/21309
Petri-Dish: Michael Mann <mmann78@netscape.net>

[Automatic update for 2017-04-23]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Iee99549ab908cd49c189d3f39674897cdfddadd7
Reviewed-on: https://code.wireshark.org/review/21300
Reviewed-by: Gerald Combs <gerald@wireshark.org>

packet-quakeworld.c: Fix potential out of bounds error.

Overflow can occur while writing to a buffer.

Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1179
Bug: 13624
Change-Id: I7511c43ed67f81d246e3eb66e092353e2ab4924c
Reviewed-on: https://code.wireshark.org/review/21235
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 22f05d620f428c0769227f0173876c95fb9aead4)
Reviewed-on: https://code.wireshark.org/review/21286

Code in epan/dissectors may require GeoIP.h, so include LIBGEOIP_FLAGS.

Change-Id: I31bd53c49906db24b64fa3f1e3078b0658db3158
Reviewed-on: https://code.wireshark.org/review/21269
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 2c52d954d5713be1b809c3b668b0353d2b355c16)
Reviewed-on: https://code.wireshark.org/review/21275
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit bf3ad38432b1a78f06ec3adc279012d433227184)
Reviewed-on: https://code.wireshark.org/review/21276

dwarf.c: Fix potential too large shift

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1167
Bug: 13616

Change-Id: I43ab629ad8368bf672d1c079219d6b055c431e86
Reviewed-on: https://code.wireshark.org/review/21249
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 70b6e406e783eab172b4b9e90e9e7e624d7facb8)
Reviewed-on: https://code.wireshark.org/review/21264

sigcomp: Shift operand should be limited to 16 bits

# Conflicts:
# epan/dissectors/packet-sigcomp.c

Change-Id: I5a6fbcacf874962c361e68fef7402dc775aca658
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1154
Bug: 13610
Reviewed-on: https://code.wireshark.org/review/21250
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-on: https://code.wireshark.org/review/21258
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

cf_open() pops up a dialog box on errors; its callers shouldn't do so.

Change-Id: I1c65854b5bde1c64d70cb17a13080829f0faa27b
Reviewed-on: https://code.wireshark.org/review/21253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit d97ce76161f573beb88fff7eefe4e0f686a4f3a9)
Reviewed-on: https://code.wireshark.org/review/21255

packet-sigcomp.c: Fix potential negative shift

Bug: 13619
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1172
Change-Id: Ifa5ed88031425701f9cb14c80eb61311e0bba4aa
Reviewed-on: https://code.wireshark.org/review/21236
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 2ab4f63dea65de2e00fa488a35a86cfd494d5fca)
Reviewed-on: https://code.wireshark.org/review/21244

packet-xot.c: Handle potentially large representation of packet sizes

Value on wire is 2^x, so represent the field that way.

Bug: 13618
Change-Id: Ida4a85e1f52b29b8b89fa835f78ef3fff2bde5c9
Reviewed-on: https://code.wireshark.org/review/21237
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: Jaap Keuter <jaap.keuter@xs4all.nl>
(cherry picked from commit 3e755bb0c1b8ad9e466db1d02d76995ce1d39763)
Reviewed-on: https://code.wireshark.org/review/21242
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

RTCP: Handle large TMMBR value presentation

TMMBR can be _very_ large (131072*2^63, larger than 64 bit entities can
hold). Therefore don't try to calculate and present the bitrate as an
integer value, but as an expression.

Bug: 13611
Change-Id: Ieb8caae5d72d06f82c134eda63f99575218584c2
Reviewed-on: https://code.wireshark.org/review/21207
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 05140af874e9bd86160659dbc8541373d662e290)
Reviewed-on: https://code.wireshark.org/review/21213