bump a few limits in DP_SMALLMEMORY (cachedpics was too low for even

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 125f554b8d3cb970054c38f059c4943fb7a29396..111550a8632107df7d141d4aebf2592965cdc128 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 char *cvar_dummy_description = "custom cvar";
 
 cvar_t *cvar_vars = NULL;
-cvar_t *cvar_hashtable[65536];
+cvar_t *cvar_hashtable[CVAR_HASHSIZE];
 char *cvar_null_string = "";
 
 /*
@@ -38,7 +38,7 @@ cvar_t *Cvar_FindVar (const char *var_name)
        cvar_t *var;
 
        // use hash lookup to minimize search time
-       hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+       hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
        for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
                if (!strcmp (var_name, var->name))
                        return var;
@@ -449,7 +449,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
        variable->next = next;
 
        // link to head of list in this hash table index
-       hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name));
+       hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
        variable->nextonhashchain = cvar_hashtable[hashindex];
        cvar_hashtable[hashindex] = variable;
 }
@@ -493,6 +493,13 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
                return cvar;
        }
 
+// check for pure evil
+       if (!*name)
+       {
+               Con_Printf("Cvar_Get: invalid variable name\n");
+               return NULL;
+       }
+
 // check for overlap with a command
        if (Cmd_Exists (name))
        {
@@ -536,7 +543,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
        cvar->next = next;
 
        // link to head of list in this hash table index
-       hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name));
+       hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE;
        cvar->nextonhashchain = cvar_hashtable[hashindex];
        cvar_hashtable[hashindex] = cvar;