URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f52abd7906907fd94123f5b93f350263fac981db
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
f52abd7 by Christopher Maynard (Christopher.Maynard@xxxxxxx):
Fix insertion of subnets read from the subnets file: append to the *end* of
the list.
The patch ensures that non-duplicate subnets are appended to the end of the
list rather than as the second element, which if there had been a second
element previously, the memory for it was effectively leaked.
It also allows /32 "subnets", even though arguably the hosts file should be
used instead, but now the test in read_subnets_file() matches the assert in
subnet_entry_set().
Bug: 11247
Change-Id: I54bf1cbb34edfcf410aa634043a377c27091df51
Reviewed-on: https://code.wireshark.org/review/8802
Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 41ac67cbb218d9d7da4bd7d767b12c03a0096b5b)
Conflicts:
epan/addr_resolv.c
Reviewed-on: https://code.wireshark.org/review/8857
Reviewed-by: Christopher Maynard <Christopher.Maynard@xxxxxxxxx>
Actions performed:
from 8dea924 tshark: fix computation of iostat table width when specifying an interval
adds f52abd7 Fix insertion of subnets read from the subnets file: append to the *end* of the list.
Summary of changes:
epan/addr_resolv.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)