summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-30Fix out-of-bounds read in ascend_seek.master-1.12Michael Mann1-0/+1
Bug: 11794 Change-Id: I74517806b119729ae6d9780bbd4bb094701ff05e Reviewed-on: https://code.wireshark.org/review/12266 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: 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 338da1c0ea0b2f8595d3a7b6d6c9548f7da3e27b) Reviewed-on: https://code.wireshark.org/review/12296 (cherry picked from commit 7abfa36686850a0d81ef1ef280a181d09e5e639c) Reviewed-on: https://code.wireshark.org/review/12297
2015-11-29Add bounds checking to find_signature.Michael Mann1-2/+2
Bug: 11791 Change-Id: Ibaa2c16229c1b78818283ba5f954b09f3894dc60 Reviewed-on: https://code.wireshark.org/review/12270 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 185911de7d337246044c8e99da2f5b4bac74c0d5) Reviewed-on: https://code.wireshark.org/review/12294 (cherry picked from commit e4267dd4d03b81c74cd6bc9f574f3f10936ee354) Reviewed-on: https://code.wireshark.org/review/12295
2015-11-29GSM SMS: fix reassembly of UCS2 encoded SMSPascal Quantin1-35/+14
Bug: 11809 Change-Id: I5cbf43cbc9d0f33fa527aef1be4d5105f1d795a7 Reviewed-on: https://code.wireshark.org/review/12288 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 257938f66c255e2e978d0bf697f1d0e780620d55) Reviewed-on: https://code.wireshark.org/review/12291
2015-11-29Replace my_dgt_tbcd_unpack with the safer tvb_bcd_dig_to_wmem_packet_str.Michael Mann4-179/+39
Bug: 11797 Change-Id: Iecca888d68e7710b871fa67af2a1174a294d9594 Reviewed-on: https://code.wireshark.org/review/12273 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-29[Automatic update for 2015-11-29]Gerald Combs4-62/+737
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idea2b72312a9d3d685b426085a78bcfb06513f54 Reviewed-on: https://code.wireshark.org/review/12286 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-29IPv6: Fix RPL routing header computed address count if ip6r_len == 0João Valverde1-1/+4
Bug: 11803 Change-Id: I6de6a240dee1cfb310c41976853c0c3683b0b80a Reviewed-on: https://code.wireshark.org/review/12277 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-29RSVP: copy all rsvp_request_key info in file scopePascal Quantin1-1/+26
This is needed as it is later used for comparisons in the request hash table Bug: 11793 Change-Id: I2ee1c894892c6ae88c4eac23237991b547a0983b Reviewed-on: https://code.wireshark.org/review/12258 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-28vwr: fix buffer overrun in getRatePeter Wu1-3/+6
Bug: 11789 Change-Id: Ieba9f32928b91be5d07b25bf54005155f7cc79f6 Reviewed-on: https://code.wireshark.org/review/12261 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 135c8f050f7f0145b54d952b38ca73eb0d1060cf) Reviewed-on: https://code.wireshark.org/review/12262
2015-11-28Diameter: check IPv6 prefix length before copying it in e_in6_addr structurePascal Quantin1-2/+8
Bug: 11792 Change-Id: I37a07044d40f10e9a1a90025d90753fdb3db2278 Reviewed-on: https://code.wireshark.org/review/12248 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit aaa28a9d39158ca1033bbd3372cf423abbf4f202) Reviewed-on: https://code.wireshark.org/review/12252
2015-11-28Add boundary check for 802.11 decryptionPeter Wu2-2/+10
Fixed stack-based buffer overflow when the frame length exceeds 8KB. Bug: 11790 Change-Id: I20db8901765a7660e587057e955d4fb5a8645574 Reviewed-on: https://code.wireshark.org/review/12237 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 40b283181c63cb28bc6f58d80315eccca6650da0) [resolved conflict by accepting comments from v2.1.0rc0-764-g9cd66b2] Reviewed-on: https://code.wireshark.org/review/12247
2015-11-27[LDAP] Bugfix counting of search results.Michael Mann2-6/+6
Bug: 11761 Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553 Reviewed-on: https://code.wireshark.org/review/12184 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 c51f207308d04bda005f84828b59cec4104e4b8f) Reviewed-on: https://code.wireshark.org/review/12221 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26L2TP: Correct L2TP over IP SHA1 message digestNicolas S. Dade1-1/+1
It should match the MD5 code, and skip over the 0x00000000 session id at the start of tvb. Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e Reviewed-on: https://code.wireshark.org/review/12168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 97e627e56d98bc45cd87cf629617c0dbd1798f6b) Reviewed-on: https://code.wireshark.org/review/12177
2015-11-26SCTP: verify frame pointer before dereferencing itPascal Quantin1-12/+16
Bug: 11767 Change-Id: Icd01550e0aaa4cd0cc33ae3acc0ef702c38f4db4 Reviewed-on: https://code.wireshark.org/review/12146 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 2259bf8a827088081bef101f98e4983de8aa8099) Conflicts: epan/dissectors/packet-sctp.c Reviewed-on: https://code.wireshark.org/review/12174
2015-11-25Fix buffer overrun in zlib decompressionPeter Wu1-3/+6
After updating next_in (to remove the gzip header), avail_in must also be updated. Failing to do makes zlib read past the input buffer. In theory this would resukt in a buffer overrun of at most double the input length, in practice zlib returns as soon as the compression fails (after reading a few bytes). Bug: 11548 Change-Id: If71691a2846338f46d866964a77cc4e74a9b61dd Reviewed-on: https://code.wireshark.org/review/12038 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 cec0593ae6c3bca65eff65741c2a10f3de3e0afe) Reviewed-on: https://code.wireshark.org/review/12138
2015-11-24VoIP: fix a crash when trying to retrieve the time of a T.38 tapped packetPascal Quantin1-1/+1
Rather than trying to retrieve frame_data from the packet number row (while it could be filtered) let's use pinfo Bug: 11596 Change-Id: Iadbae7630da012c72b29628384a0825511672692 Reviewed-on: https://code.wireshark.org/review/12106 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-24Fix indentation.Guy Harris1-1/+1
Change-Id: I2a64b9919d257ee0f7a57ba40c33bea1690ae0ad Reviewed-on: https://code.wireshark.org/review/12086 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit da8854144d17b197d367e4bb35afd47d24b50b12) Reviewed-on: https://code.wireshark.org/review/12088
2015-11-24Check *how many* fields sscanf() found.Guy Harris1-31/+82
In the code that parses a GeneralizedTime field, don't assume that all fields were found; check the return value from sscanf(). This should clean up a fuzz failure on the 2.0 buildbot: https://buildbot.wireshark.org/wireshark-2.0/builders/Fuzz%20Test/builds/13/steps/valgrind-wireshark/logs/stdio Change-Id: I431d7ed69ac1697bd42c22a37ca1451cfc85c94e Reviewed-on: https://code.wireshark.org/review/12083 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 921bb07115fbffc081ec56a5022b4a9d58db6d39) Reviewed-on: https://code.wireshark.org/review/12085
2015-11-23HiSLIP: remove a DISSECTOR_ASSERTPascal Quantin1-7/+6
It should not be used for request/response tracking Change-Id: Ic93884cad5bcea40e082081097575908011871c8 Ping-Bug: 11752 Reviewed-on: https://code.wireshark.org/review/12063 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 8fa938d27b7388e6b5881718d45abd3315a0583c) Conflicts: epan/dissectors/packet-hislip.c Reviewed-on: https://code.wireshark.org/review/12072 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-17Create C handles for pipes before running dumpcap.Guy Harris1-39/+90
If the C handles can't be created, there's no point in running dumpcap. Catch some more possible _open_osfhandle() failures while we're at it. Change-Id: I5b805552630034a1eaea2a6d2bfe6039cd6d7727 Reviewed-on: https://code.wireshark.org/review/11904 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-16Catch failure of _open_osfhandle().Guy Harris1-0/+24
This may at least prevent the crash in bug 11702, by not returning "success" with bogus file handles of -1, if the opens fail due to leaks chewing up all the available slots. More investigation needs to be done to see why we're leaking. Change-Id: Iaa0fdac415ea1047255d64fa8597529ad31d63d1 Reviewed-on: https://code.wireshark.org/review/11889 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-15[Automatic update for 2015-11-15]Gerald Combs4-7/+43
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I51ffb979cc03249d4d2bfb06e6a8699f9f0c5bbb Reviewed-on: https://code.wireshark.org/review/11840 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-14DNS: Ignore Client Subnet option's data length when > 16Alexis La Goutte1-5/+6
When DNS Client Subnet length is > 16, the limit coming from avoid stack smashing with tvb_memcpy Issue reported by Boaz Bug:10988 Change-Id: I6103ba47fac9817410c7fc399c18e96c66ab8438 Reviewed-on: https://code.wireshark.org/review/7308 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: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 30651ab18b42e666f57ea239e58f3ff3a5e9c4ad) Reviewed-on: https://code.wireshark.org/review/11824 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11Add CMakeLists.txt.user* to .gitignore.Gerald Combs1-0/+1
Qt Creator uses CMakeLists.txt.user to store CMake build settings. Change-Id: I600289183dcfbc03cd9b555c4b646e6cfb799b0e Reviewed-on: https://code.wireshark.org/review/11700 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit ec303c13b3f8df1feeae449830f57f20660229eb) Reviewed-on: https://code.wireshark.org/review/11710 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-08[Automatic update for 2015-11-08]Gerald Combs4-148/+300
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8cfa75911e483e0c2216f059678e116d18b0901c Reviewed-on: https://code.wireshark.org/review/11645 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-08GTP sequence number fix for allowing to have sequence number equal to 0Gloria Pozuelo1-2/+7
Change-Id: Id8aad52198905eb33ecccf5ace01287954f31d2e Reviewed-on: https://code.wireshark.org/review/11526 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 0b3091fa359492a0fe7af50a42a2f70d85377a35) Reviewed-on: https://code.wireshark.org/review/11642
2015-11-07NSIS: clear errors before checking WinPcap uninstall registry entryPascal Quantin1-2/+4
Otherwise it can lead to a false verdict in after the check for Wireshark uninstall registry entry Bug: 10867 Change-Id: I213ac8ffadfb3578b05d33b996540bd4330a0ec5 Reviewed-on: https://code.wireshark.org/review/11621 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit cdcf27255ab8907e7fe29b4518fca1c4e53202ab) Reviewed-on: https://code.wireshark.org/review/11623
2015-11-01[Automatic update for 2015-11-01]Gerald Combs3-221/+405
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7e6a7d2a417805b783b974edc3e869c0fefa9c3c Reviewed-on: https://code.wireshark.org/review/11479 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-30RPC: fix crash when calling NLMv4 SRT statisticsPascal Quantin1-1/+1
Packet scope is not valid when called from GUI. As master-1.12 does not benefit from the code refactring done in master, we cannot use the same solution as in g59f4c1c Instead allow to leak a bit of memory by allocating in the epan scope. Bug: 11654 Change-Id: Ia896299766f7e132b944af48a210fd44d8412282 Reviewed-on: https://code.wireshark.org/review/11447 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30NLM: fix double memory free when using "Match MSG/RES packets for async NLM" ↵Pascal Quantin1-10/+11
option Change-Id: I8ac8bbb7830a49c1a0973b16378515b00a1a7b65 Reviewed-on: https://code.wireshark.org/review/11432 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-30spdy: do not overwrite HTTPS registrationPeter Wu1-2/+2
Setting a zero port still allows it for selection in the UAT dialog while not breaking HTTPS dissection. (In theory the UAT setting would work. In practice it would still call ssl_dissector_add and take over the SSL registration for all tcp/443 traffic. On removal with ssl_dissector_remove, the HTTPS port is not added back again until a restart (or until the HTTPS ports list is changed from the default) because the spdy registration overwrites the HTTP one...) Also note that NPN detection for SPDY is not implemented, only ALPN detection is supported. Bug: 10984 Change-Id: I6e84aa6408abf40bb860abee4845731ce55ce254 Reviewed-on: https://code.wireshark.org/review/10517 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit bb7f7d32688abcbc05e954bf380d5759a0b9bf47) Reviewed-on: https://code.wireshark.org/review/11422 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl>
2015-10-29EtherCAT: wrong display nameAlexis La Goutte1-1/+1
Wireshark is showing 2 consecutive bytes named "SubIdx" in a SDO info request (OpCode = 0x5) and response (OpCode = 0x6). But the second byte should be the "ValueInfo" instead in both request and response. Issue reported by ThoKu Bug:11652 Change-Id: I7f6395208d38e714071de5dbb40e3ddb9829f210 Reviewed-on: https://code.wireshark.org/review/11397 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: Michael Mann <mmann78@netscape.net> (cherry picked from commit 6c9ddbda65408ed15af69d74bfaa881e308f63b2) Reviewed-on: https://code.wireshark.org/review/11401
2015-10-29pcp: fix reporting of error status in info columnRyan Doyle1-1/+1
Typo when the dissector was first written. It should have always been the offset. Change-Id: Ica7e88571d3746811b574834cbfa0f91218d573c Reviewed-on: https://code.wireshark.org/review/11393 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit caeb5b0c2f461e1d51e914b0ef5e9adecc45dd76) Reviewed-on: https://code.wireshark.org/review/11395
2015-10-27GVCP: do not try to append register value to info column when READREG_ACK ↵Pascal Quantin1-1/+8
has an error status Bug: 11639 Change-Id: I1389b74092138e3b28cf4f0dd2d2c8967ec8ba12 Reviewed-on: https://code.wireshark.org/review/11310 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 4f22e9937f72a43e53262d0ca3297f686109f4c4) Reviewed-on: https://code.wireshark.org/review/11314
2015-10-25[Automatic update for 2015-10-25]Gerald Combs4-24/+172
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia161aa78733c6ec056c1281aca4612fde236650f Reviewed-on: https://code.wireshark.org/review/11266 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-25SDP: protect against out of bounds accessPascal Quantin1-1/+1
Change-Id: I4b24441cb26757b639e8113cab18d64c7f07112f Ping-Bug: 9887 Reviewed-on: https://code.wireshark.org/review/11241 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 2ddd92b6f8f587325b9e14598658626f3a007c5c) Reviewed-on: https://code.wireshark.org/review/11261
2015-10-25802.1ah: call subdissectors even when we have no tree.Jeff Morriss1-9/+8
Otherwise none of the subdissectors are called on the first pass which means none of their analysis (which is generally done on the first pass) is going to work. Bug: 11629 Change-Id: I6fe8d0692e5cf6f5b5fa099d31a91d01cc5c7c68 Reviewed-on: https://code.wireshark.org/review/11226 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit ae130f114cd61443c8c93e1c9280e027726a0235) Conflicts: epan/dissectors/packet-ieee8021ah.c Reviewed-on: https://code.wireshark.org/review/11255 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-24T38: fix a dereference of NULL pointerPascal Quantin2-64/+64
Change-Id: I6d0a87e301145f43af0c0ccba44c1dbb2f84adb2 Ping-Bug: 9887 Reviewed-on: https://code.wireshark.org/review/11243 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit eb6ccb1b0c4ad02b828652c3fe6e8d51c30a315e) Reviewed-on: https://code.wireshark.org/review/11244
2015-10-19AllJoyn: prevent an infinite loopPascal Quantin1-0/+19
Display an expert error when the argument is empty Bug: 11607 Change-Id: I8682eab8fe1822f784e848220ff90de4eb5e13ff Reviewed-on: https://code.wireshark.org/review/11132 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 40caff2d1fb08262c84aaaa8ac584baa8866dd7c) Conflicts: epan/dissectors/packet-alljoyn.c Reviewed-on: https://code.wireshark.org/review/11140
2015-10-18DCOM: ensure to initialize IPv4 variable put on the stackPascal Quantin1-0/+1
Bug: 11610 Change-Id: I920b88ab035ff34e7cff9eab8158aa2dabe2faac Reviewed-on: https://code.wireshark.org/review/11134 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> (cherry picked from commit d34267d0503a67235bf259fd2f2f2d2bb8b18cf5) Reviewed-on: https://code.wireshark.org/review/11136 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-18[Automatic update for 2015-10-18]Gerald Combs3-176/+450
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8d5497b88606f492ce7062f1e741bb9e79013d29 Reviewed-on: https://code.wireshark.org/review/11131 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-18UMTS FP: fix another out of bounds accessPascal Quantin1-1/+1
According to NBAP ASN.1, the maximum DCH ID value is 255 Bug: 11606 Change-Id: Ic5c85a31eb1a84d59f25baaed4afbd040a7852c5 Reviewed-on: https://code.wireshark.org/review/11126 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 67b6d4f7e6f2117b40957fd51518aa2a3e659002) Reviewed-on: https://code.wireshark.org/review/11128
2015-10-17UMTS FP: fix an out of bounds accessPascal Quantin1-1/+1
Bug: 11602 Change-Id: I636a5494a0eda5895e856e80424be29f01c758bf Reviewed-on: https://code.wireshark.org/review/11117 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 2ae329a47b7f0ac94089c23e79c6b8bc18ba80ea) Conflicts: epan/dissectors/packet-umts_fp.c Reviewed-on: https://code.wireshark.org/review/11123
2015-10-17NBAP: avoid dereferencing a NULL pointerPascal Quantin2-36/+42
Bug: 11602 Change-Id: I56b9db19eca416c288f36c1f3a4faa7e22b38c8f Reviewed-on: https://code.wireshark.org/review/11109 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: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 5bf565690ad9f0771196d8fa237aa37fae3bb7cc) Conflicts: epan/dissectors/packet-nbap.c Reviewed-on: https://code.wireshark.org/review/11116
2015-10-16GSM: fix dissection of additional access technology typePascal Quantin1-1/+1
Bug: 11599 Change-Id: I80e92eefd233ad7939f8fdf684727164bd89abf4 Reviewed-on: https://code.wireshark.org/review/11094 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 b737d7e1b888a06891f6bd78aa58e62f77fb3f94) Reviewed-on: https://code.wireshark.org/review/11098
2015-10-141.12.8 → 1.12.9.Gerald Combs11-1032/+20
Change-Id: Ida58dbef0bdca8149f9825ebf2e99e279ebd0b09 Reviewed-on: https://code.wireshark.org/review/11045 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-14Build 1.12.8.Gerald Combs6-139/+1066
Change-Id: I36da4cdca6721a99cbf54d6a5b21ccbc6a08423f Reviewed-on: https://code.wireshark.org/review/11037 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-14allow use of deprecated gdk-pixbuf functionsAndreas Stieger1-1/+0
gdk-pixbuf 2.31.2 marked GdkPixdata including as deprecated, including gdk_pixbuf_new_from_inline. Wireshark builds with deprecated functions turned off by default, in this case GDK_PIXBUF_DISABLE_DEPRECATED. Patch to configure.ac to allow use of deprecated function until upstream has ported the code, or a replacement patch is available. gdk-pixbuf change: https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9 Initial warning: ui_utils.c: In function 'window_icon_realize_cb': ui_utils.c:115:5: warning: implicit declaration of function 'gdk_pixbuf_new_from_inline' [-Wimplicit-function-declaration] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Causes these warnings due to the implicit declaration: gui_utils.c:115:10: warning: assignment makes pointer from integer without a cast [enabled by default] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Fails the package checks in these lines: E: wireshark 64bit-portability-issue gui_utils.c:115, 117, 119, 121, 512 E: wireshark 64bit-portability-issue main.c:1513, 1519, 1525, 1531 E: wireshark 64bit-portability-issue prefs_layout.c:346, 347, 348, 349, 350, 351 E: wireshark 64bit-portability-issue stock_icons.c:413, 425 [Cherry-picked to master-1.12 to get that version compiling cleanly with warnings-as-errors enabled.] Bug: 10750 Change-Id: I85092753058cd2e5cda527e4321a7d92ac38facd Reviewed-on: https://code.wireshark.org/review/8578 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> (cherry picked from commit 8f462b073755398205f3d67db0f4333c9c6984f9) Reviewed-on: https://code.wireshark.org/review/11033 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-14gtk: Don't handle deprecation warnings as errorsBalint Reczey2-2/+2
This fixes compilation with latest gdk-pixbuf. I plan rewriting the code to drop deprecaated function usage in a different commit and reverting this one. [Cherry-picked to master-1.12 together with I85092753058cd2e5cda527e4321a7d92ac38facd to get master-1.12 compiling with warnings-as-errors enabled.] Ping-Bug: 10750 Change-Id: I400e34e625b147a4858e73240602d75910c6eece Reviewed-on: https://code.wireshark.org/review/8720 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit f1a6ba1aa2f86b86613089099391aa005163a2f7) Reviewed-on: https://code.wireshark.org/review/11031 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-14TCP: only store up to 1000 unacked segments (in each direction).Jeff Morriss2-3/+9
If we're seeing only one side of a conversation (we're not seeing any ACKs) then things get really, really slow as the number of unacked segments grows. 1000 is, of course, an arbitrary limit. Bug: 11589 Change-Id: I42652965b736da50122c722e6ac386c4d481e57f Reviewed-on: https://code.wireshark.org/review/10971 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 065c4646a631690896c9b45cadc4cc2d012255d8) Reviewed-on: https://code.wireshark.org/review/11013 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-13Updates for 1.12.8.Gerald Combs1-9/+34
Change-Id: I1a6514a78eb93afde161c2f1c32e9a7bf14f6792 Reviewed-on: https://code.wireshark.org/review/10980 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-29 16:46:32 +0000