cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dont read past the end of the array, from uqm cvs

Browse Source
This commit is contained in:
jolan 2004-10-16 00:28:22 +00:00
parent 155d7dff1c
commit 62383802fd
2 changed files with 90 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
games/uqm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2004/10/01 05:08:22 jolan Exp $
# $OpenBSD: Makefile,v 1.12 2004/10/16 00:28:22 jolan Exp $
# 64-bit issues, unaligned memory access
ONLY_FOR_ARCHS= i386 powerpc
@ -24,7 +24,7 @@ DISTFILES= ${PDIST} ${CDIST}
SUPDISTFILES= ${MDIST} ${VDIST} ${RM1DIST} ${RM2DIST} ${RM3DIST}
DIST_SUBDIR= uqm
CATEGORIES= games x11
PKGNAME= uqm-${VER}
PKGNAME= uqm-${VER}p0
PKGNAME-remix1= uqm-remix1-${VER}
PKGNAME-remix2= uqm-remix2-${VER}
PKGNAME-remix3= uqm-remix3-${VER}
@ -100,7 +100,7 @@ RUN_DEPENDS= ::games/uqm
. endif
.endif
WRKSRC= ${WRKDIR}/${PKGNAME}
WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//}
do-configure:
.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \

87
games/uqm/patches/patch-src_sc2code_libs_uio_hashtable_c Normal file
View File

@ -0,0 +1,87 @@
$OpenBSD: patch-src_sc2code_libs_uio_hashtable_c,v 1.1 2004/10/16 00:28:22 jolan Exp $
--- src/sc2code/libs/uio/hashtable.c.orig Tue Jul 8 13:17:40 2003
+++ src/sc2code/libs/uio/hashtable.c Fri Oct 15 14:10:12 2004
@@ -169,8 +169,6 @@ HASHTABLE_(setup)(HASHTABLE_(HashTable)
* hashTable->maxFillQuotient);
hashTable->entries = uio_calloc(hashTable->size,
sizeof (HASHTABLE_(HashEntry) *));
- memset(hashTable->entries, '\0',
- hashTable->size * sizeof (HASHTABLE_(HashEntry) *));
hashTable->numEntries = 0;
#ifdef HashTable_PROFILE
hashTable->numCollisions = 0;
@@ -232,18 +230,26 @@ nextPower2(uio_uint32 x) {
// there are outstanding iterators.
HASHTABLE_(Iterator) *
HASHTABLE_(getIterator)(const HASHTABLE_(HashTable) *hashTable) {
- HASHTABLE_(Iterator) *result;
+ HASHTABLE_(Iterator) *iterator;
uio_uint32 i;
- result = uio_malloc(sizeof (HASHTABLE_(Iterator)));
- result->hashTable = hashTable;
- i = 0;
- while (i < hashTable->size &&
- hashTable->entries[i] == NULL)
- i++;
- result->bucketNr = i;
- result->entry = hashTable->entries[i];
- return result;
+ iterator = uio_malloc(sizeof (HASHTABLE_(Iterator)));
+ iterator->hashTable = hashTable;
+
+ // Look for the first used bucket.
+ for (i = 0; i < iterator->hashTable->size; i++) {
+ if (iterator->hashTable->entries[i] != NULL) {
+ // Found a used bucket.
+ iterator->bucketNr = i;
+ iterator->entry = iterator->hashTable->entries[i];
+ return iterator;
+ }
+ }
+
+ // No entries were found.
+ iterator->bucketNr = i;
+ iterator->entry = NULL;
+ return iterator;
}
int
@@ -261,22 +267,29 @@ HASHTABLE_(iteratorValue)(HASHTABLE_(Ite
return iterator->entry->value;
}
+// Should not be called if the iterator is already past the last entry.
HASHTABLE_(Iterator) *
HASHTABLE_(iteratorNext)(HASHTABLE_(Iterator) *iterator) {
uio_uint32 i;
- if (iterator->entry != NULL) {
- iterator->entry = iterator->entry->next;
- if (iterator->entry != NULL)
+ // If there's another entry in this bucket, use that.
+ iterator->entry = iterator->entry->next;
+ if (iterator->entry != NULL)
+ return iterator;
+
+ // Look for the next used bucket.
+ for (i = iterator->bucketNr + 1; i < iterator->hashTable->size; i++) {
+ if (iterator->hashTable->entries[i] != NULL) {
+ // Found another used bucket.
+ iterator->bucketNr = i;
+ iterator->entry = iterator->hashTable->entries[i];
return iterator;
+ }
}
- i = iterator->bucketNr + 1;
- while (i < iterator->hashTable->size &&
- iterator->hashTable->entries[i] == NULL)
- i++;
+ // No more entries were found.
iterator->bucketNr = i;
- iterator->entry = iterator->hashTable->entries[i];
+ iterator->entry = NULL;
return iterator;
}