Wireshark-commits: [Wireshark-commits] lts-1.8.2 8f4a7b1: Check *how many* fields sscanf() found.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8f4a7b1ffd56b4f4010fa2c41f8a5e827b38beb7
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.8.2
Repository: wireshark
Commits:
8f4a7b1 by Guy Harris (guy@xxxxxxxxxxxx):
Check *how many* fields sscanf() found.
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
Conflicts:
epan/dissectors/packet-ber.c
Change-Id: I431d7ed69ac1697bd42c22a37ca1451cfc85c94e
Reviewed-on: https://code.wireshark.org/review/12083
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit 921bb07115fbffc081ec56a5022b4a9d58db6d39)
Reviewed-on: https://code.wireshark.org/review/12085
(cherry picked from commit 2c5997060c1cc91dc3ba964d4494751b50f25470)
Reviewed-on: https://code.wireshark.org/review/13758
Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
Reviewed-on: https://code.wireshark.org/review/14248
Actions performed:
from e0c09e0 NLM: fix double memory free when using "Match MSG/RES packets for async NLM" option
adds 8f4a7b1 Check *how many* fields sscanf() found.
Summary of changes:
epan/dissectors/packet-ber.c | 109 +++++++++++++++++++++++++++++++-----------
1 file changed, 81 insertions(+), 28 deletions(-)