[glib: 6/6] Merge branch 'mcatanzaro/#2597' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 164d3759fb9f5ad0be6a023b02d1e381ff7c28bf
Merge: 113d7263c6 8e29865112
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Jun 28 10:33:33 2022 +0000

    Merge branch 'mcatanzaro/#2597' into 'main'
    
    Avoid crashing when GProxyResolver returns weird results, and related fixes
    
    Closes #2597
    
    See merge request GNOME/glib!2742

 gio/gproxyaddressenumerator.c |  40 +++++++++--
 gio/gproxyresolver.c          |  12 +++-
 gio/gsimpleproxyresolver.c    |   5 +-
 gio/tests/proxy-test.c        | 156 +++++++++++++++++++++++++++++++++++++++---
 4 files changed, 194 insertions(+), 19 deletions(-)
---