diff options
author | wm4 <wm4@nowhere> | 2014-07-01 23:10:38 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-01 23:11:08 +0200 |
commit | 9a210ca2d50e02bf045866bbb2f44a33a3c48cd9 (patch) | |
tree | 9f685c66c9d3b2e968416c7f60d30ea56ab1f9bb /options/parse_configfile.c | |
parent | 0208ad4f3b4d2331b8242bb6fb12a9a4475ccae6 (diff) | |
download | mpv-9a210ca2d50e02bf045866bbb2f44a33a3c48cd9.tar.bz2 mpv-9a210ca2d50e02bf045866bbb2f44a33a3c48cd9.tar.xz |
Audit and replace all ctype.h uses
Something like "char *s = ...; isdigit(s[0]);" triggers undefined
behavior, because char can be signed, and thus s[0] can be a negative
value. The is*() functions require unsigned char _or_ EOF. EOF is a
special value outside of unsigned char range, thus the argument to the
is*() functions can't be a char.
This undefined behavior can actually trigger crashes if the
implementation of these functions e.g. uses lookup tables, which are
then indexed with out-of-range values.
Replace all <ctype.h> uses with our own custom mp_is*() functions added
with misc/ctype.h. As a bonus, these functions are locale-independent.
(Although currently, we _require_ C locale for other reasons.)
Diffstat (limited to 'options/parse_configfile.c')
-rw-r--r-- | options/parse_configfile.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/options/parse_configfile.c b/options/parse_configfile.c index 1e12a5c47f..112a26b115 100644 --- a/options/parse_configfile.c +++ b/options/parse_configfile.c @@ -22,13 +22,13 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <ctype.h> #include <assert.h> #include "osdep/io.h" #include "parse_configfile.h" #include "common/msg.h" +#include "misc/ctype.h" #include "m_option.h" #include "m_config.h" @@ -95,7 +95,7 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile, line_pos = 0; /* skip whitespaces */ - while (isspace(line[line_pos])) + while (mp_isspace(line[line_pos])) ++line_pos; /* EOL / comment */ @@ -103,7 +103,7 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile, continue; /* read option. */ - for (opt_pos = 0; isprint(line[line_pos]) && + for (opt_pos = 0; mp_isprint(line[line_pos]) && line[line_pos] != ' ' && line[line_pos] != '#' && line[line_pos] != '='; /* NOTHING */) { @@ -133,7 +133,7 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile, } /* skip whitespaces */ - while (isspace(line[line_pos])) + while (mp_isspace(line[line_pos])) ++line_pos; param_pos = 0; @@ -145,7 +145,7 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile, param_set = true; /* whitespaces... */ - while (isspace(line[line_pos])) + while (mp_isspace(line[line_pos])) ++line_pos; /* read the parameter */ @@ -187,8 +187,8 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile, } } - for (param_pos = 0; isprint(line[line_pos]) - && !isspace(line[line_pos]) + for (param_pos = 0; mp_isprint(line[line_pos]) + && !mp_isspace(line[line_pos]) && line[line_pos] != '#'; /* NOTHING */) { param[param_pos++] = line[line_pos++]; if (param_pos >= MAX_PARAM_LEN) { @@ -202,7 +202,7 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile, param_done: - while (isspace(line[line_pos])) + while (mp_isspace(line[line_pos])) ++line_pos; } param[param_pos] = '\0'; |