(svn r13291) -Fix (r13266): qsort passed wrong sizeof data
authorpeter1138
Tue, 27 May 2008 15:30:51 +0000
changeset 10741 6efaa60ef3c6
parent 10737 0f704b9afd93
child 10742 e7bb9f5eb559
(svn r13291) -Fix (r13266): qsort passed wrong sizeof data
src/industry_gui.cpp
src/network/network_gui.cpp
src/vehicle_gui.cpp
--- a/src/industry_gui.cpp	Tue May 27 12:24:23 2008 +0000
+++ b/src/industry_gui.cpp	Tue May 27 15:30:51 2008 +0000
@@ -841,7 +841,7 @@
 
 	_internal_sort_order = (sl->sort_type << 1) | (sl->flags & VL_DESC);
 	_last_industry = NULL; // used for "cache" in namesorting
-	qsort((void*)sl->Begin(), sl->Length(), sizeof(sl->Begin()), &GeneralIndustrySorter);
+	qsort((void*)sl->Begin(), sl->Length(), sizeof(*sl->Begin()), &GeneralIndustrySorter);
 
 	sl->flags &= ~VL_RESORT;
 }
--- a/src/network/network_gui.cpp	Tue May 27 12:24:23 2008 +0000
+++ b/src/network/network_gui.cpp	Tue May 27 15:30:51 2008 +0000
@@ -237,7 +237,7 @@
 		if (this->servers.Length() == 0) return;
 
 		_internal_sort_order = !!(this->servers.flags & VL_DESC);
-		qsort(this->servers.Begin(), this->servers.Length(), sizeof(this->servers.Begin()), ngame_sorter[this->servers.sort_type]);
+		qsort(this->servers.Begin(), this->servers.Length(), sizeof(*this->servers.Begin()), ngame_sorter[this->servers.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
--- a/src/vehicle_gui.cpp	Tue May 27 12:24:23 2008 +0000
+++ b/src/vehicle_gui.cpp	Tue May 27 15:30:51 2008 +0000
@@ -110,7 +110,7 @@
 	_last_vehicle[0] = _last_vehicle[1] = NULL;
 
 	_internal_sort_order = (vl->vehicles.flags & VL_DESC) != 0;
-	qsort((void*)vl->vehicles.Begin(), vl->vehicles.Length(), sizeof(vl->vehicles.Begin()),
+	qsort((void*)vl->vehicles.Begin(), vl->vehicles.Length(), sizeof(*vl->vehicles.Begin()),
 		_vehicle_sorter[vl->vehicles.sort_type]);
 
 	vl->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
@@ -121,7 +121,7 @@
 {
 	_internal_sort_order = 0;
 	if (list->Length() < 2) return;
-	qsort((void*)list->Begin(), list->Length(), sizeof(list->Begin()), _vehicle_sorter[0]);
+	qsort((void*)list->Begin(), list->Length(), sizeof(*list->Begin()), _vehicle_sorter[0]);
 }
 
 /** draw the vehicle profit button in the vehicle list window. */