OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed hash table allocation to avoid an assertion failure due to a

Browse Source 
bad config file. Fixed two more typos.
This commit is contained in:
Felix Kuehling
2004-07-26 12:42:36 +00:00
parent dec1191d45
commit fff87eecbe
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/drivers/dri/common/xmlconfig.c
View File

@@ -77,7 +77,7 @@ static const char *__getProgramName () {
# define GET_PROGRAM_NAME() __getProgramName() # define GET_PROGRAM_NAME() __getProgramName()
# else # else
# define GET_PROGRAM_NAME() "" # define GET_PROGRAM_NAME() ""
# warning "Per application configuration won't with your OS version work." # warning "Per application configuration won't work with your OS version."
# endif # endif
#endif #endif
@@ -647,13 +647,17 @@ void driParseOptionInfo (driOptionCache *info,
struct OptInfoData *data = &userData; struct OptInfoData *data = &userData;
GLuint realNoptions; GLuint realNoptions;
/* determine hash table size and allocate memory */ /* determine hash table size and allocate memory:
* 3/2 of the number of options, rounded up, so there remains always
* at least one free entry. This is needed for detecting undefined
* options in configuration files without getting a hash table overflow.
* Round this up to a power of two. */
GLuint minSize = (nConfigOptions*3 + 1) / 2;
GLuint size, log2size; GLuint size, log2size;
for (size = 1, log2size = 0; size < nConfigOptions*3/2; for (size = 1, log2size = 0; size < minSize; size <<= 1, ++log2size);
size <<= 1, ++log2size);
info->tableSize = log2size; info->tableSize = log2size;
info->info = CALLOC (size * sizeof (driOptionInfo)); info->info = CALLOC (size * sizeof (driOptionInfo));
info->values = CALLOC (size * sizeof (driOptionInfo)); info->values = CALLOC (size * sizeof (driOptionValue));
if (info->info == NULL || info->values == NULL) { if (info->info == NULL || info->values == NULL) {
fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__); fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
abort(); abort();