zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-21 11:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix warning: array subscript is above array bounds in settings.c, and this time it's really fixed; the compiler wasn't nitpicking!

Browse source
This commit is contained in:
Pedro Lopez-Cabanillas 2010-09-04 10:26:19 +00:00
parent fc5ab58722
commit b9bd70eff0
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fluidsynth/src/utils/fluid_settings.c
View file

@ -32,8 +32,8 @@
extern void fluid_file_renderer_settings (fluid_settings_t* settings); extern void fluid_file_renderer_settings (fluid_settings_t* settings);
/* maximum allowed components of a settings variable (separated by '.') */ /* maximum allowed components of a settings variable (separated by '.') */
#define MAX_SETTINGS_TOKENS 8 /* currently only a max of 3 are used */ #define MAX_SETTINGS_TOKENS 8 /* currently only a max of 3 are used */
#define MAX_SETTINGS_LABEL 256 /* max length of a settings variable label */ #define MAX_SETTINGS_LABEL 256 /* max length of a settings variable label */
static void fluid_settings_init(fluid_settings_t* settings); static void fluid_settings_init(fluid_settings_t* settings);
static void fluid_settings_key_destroy_func(void* value); static void fluid_settings_key_destroy_func(void* value);
@ -319,14 +319,13 @@ fluid_settings_tokenize(const char *s, char *buf, char **ptr)
while ((tok = fluid_strtok (&tokstr, "."))) while ((tok = fluid_strtok (&tokstr, ".")))
{ {
if (n > MAX_SETTINGS_TOKENS) if (n >= MAX_SETTINGS_TOKENS)
{ {
FLUID_LOG(FLUID_ERR, "Setting variable name exceeded max token count of %d", FLUID_LOG(FLUID_ERR, "Setting variable name exceeded max token count of %d",
MAX_SETTINGS_TOKENS); MAX_SETTINGS_TOKENS);
return 0; return 0;
} } else
else ptr[n++] = tok;
ptr[n++] = tok;
} }
return n; return n;