Wireshark-commits: [Wireshark-commits] master-3.0 b4c35c3: maxmind_db: Work around an apparent GLib
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b4c35c30afecbd87578b00b8561a1c004f0719b8
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark
Commits:
b4c35c3 by Gerald Combs (gerald@xxxxxxxxxxxxx):
maxmind_db: Work around an apparent GLib bug.
g_async_queue_timeout_pop can return immediately on macOS and possibly
other OSes when using older versions of GLib. Replace it with
g_async_queue_pop and a "stop" sentinel value.
Bug: 15545
Change-Id: Id0bfacd4a94ec9645d2d27ba92d3a2f48e7d5f37
Reviewed-on: https://code.wireshark.org/review/32289
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit 74e2d552ea7e393e789c19780945651afd62b3e1)
Reviewed-on: https://code.wireshark.org/review/32319
Actions performed:
from 6dbad63 DHCP: fix copy&paste error in field descr
add b4c35c3 maxmind_db: Work around an apparent GLib bug.
Summary of changes:
epan/maxmind_db.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)