mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4413 from janisozaur/fixes

Browse Source 
* Make sure shifted value is unsigned
* Guard against passing NULL to qsort()
This commit is contained in:
Ted John
2016-09-12 08:18:29 +01:00
committed by GitHub
parent 0ed526bb0d f6daea7cef
commit 70d35e91fb
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/peep/staff.c
View File

@@ -610,7 +610,7 @@ bool staff_is_patrol_area_set(int staffIndex, int x, int y)
int peepOffset = staffIndex * 128;
int offset = (x | y) >> 5;
int bitIndex = (x | y) & 0x1F;
return gStaffPatrolAreas[peepOffset + offset] & (1 << bitIndex);
return gStaffPatrolAreas[peepOffset + offset] & (((uint32)1) << bitIndex);
}
void staff_set_patrol_area(int staffIndex, int x, int y, bool value)

3
src/windows/server_list.c
View File

@@ -695,6 +695,9 @@ static int server_compare(const void *a, const void *b)
static void sort_servers()
{
if (_serverEntries == NULL) {
return;
}
qsort(_serverEntries, _numServerEntries, sizeof(server_entry), server_compare);
}