From 5c8bd4b143db2bdcfa7d14df52b8d4265cd9960f Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 20 May 2006 17:22:32 +0000 Subject: [PATCH] (svn r4923) - Backport from trunk (r4892): Crash when sorting an empty server list. --- network_gui.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/network_gui.c b/network_gui.c index 24b11f44a8..4d2803a5a0 100644 --- a/network_gui.c +++ b/network_gui.c @@ -151,12 +151,6 @@ static int CDECL NGameAllowedSorter(const void *a, const void *b) return (_internal_sort_order & 1) ? -r : r; } -static NGameNameSortFunction* const _ngame_sorter[] = { - &NGameNameSorter, - &NGameClientSorter, - &NGameAllowedSorter -}; - /** (Re)build the network game list as its amount has changed because * an item has been added or deleted for example * @param ngl list_d struct that contains all necessary information for sorting */ @@ -188,13 +182,20 @@ static void BuildNetworkGameList(network_ql_d *nqld) static void SortNetworkGameList(network_ql_d *nqld) { + static NGameNameSortFunction* const ngame_sorter[] = { + &NGameNameSorter, + &NGameClientSorter, + &NGameAllowedSorter + }; + NetworkGameList *item; uint i; if (!(nqld->l.flags & VL_RESORT)) return; + if (nqld->l.list_length == 0) return; _internal_sort_order = nqld->l.flags & VL_DESC; - qsort(nqld->sort_list, nqld->l.list_length, sizeof(nqld->sort_list[0]), _ngame_sorter[nqld->l.sort_type]); + qsort(nqld->sort_list, nqld->l.list_length, sizeof(nqld->sort_list[0]), ngame_sorter[nqld->l.sort_type]); /* After sorting ngl->sort_list contains the sorted items. Put these back * into the original list. Basically nothing has changed, we are only