diff options
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/eval.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index ba0601cd26..eeb0b9084b 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -41,7 +41,7 @@ #define LIBAVUTIL_VERSION_MAJOR 50 #define LIBAVUTIL_VERSION_MINOR 32 -#define LIBAVUTIL_VERSION_MICRO 4 +#define LIBAVUTIL_VERSION_MICRO 5 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/libavutil/eval.c b/libavutil/eval.c index 2799160094..a4ae2695d7 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -103,13 +103,16 @@ double av_strtod(const char *numstr, char **tail) return d; } +#define IS_IDENTIFIER_CHAR(c) ((c) - '0' <= 9U || (c) - 'a' <= 25U || (c) - 'A' <= 25U || (c) == '_') + static int strmatch(const char *s, const char *prefix) { int i; for (i=0; prefix[i]; i++) { if (prefix[i] != s[i]) return 0; } - return 1; + /* return 1 only if the s identifier is terminated */ + return !IS_IDENTIFIER_CHAR(s[i]); } struct AVExpr { |