aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-04-16 00:09:38 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-05-09 11:21:57 +0200
commit3905acef67e04578691d0bf15fa7111496c803d7 (patch)
tree046cf7104361baef0baf30982b1780a0416af8fa
parentd2035634943f82dfebccb52fe47692c1890c208e (diff)
downloadffmpeg-3905acef67e04578691d0bf15fa7111496c803d7.tar.gz
avutil/avstring: Fix bug and undefined behavior in av_strncasecmp()
The function in case of n=0 would read more bytes than 0. The end pointer could be beyond the allocated space, which is undefined. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6f0e9a863466bfcbd75ee15d4d8a6aad2a5126a4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavutil/avstring.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 1787a1ef54..ccd6446867 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -222,12 +222,13 @@ int av_strcasecmp(const char *a, const char *b)
int av_strncasecmp(const char *a, const char *b, size_t n)
{
- const char *end = a + n;
uint8_t c1, c2;
+ if (n <= 0)
+ return 0;
do {
c1 = av_tolower(*a++);
c2 = av_tolower(*b++);
- } while (a < end && c1 && c1 == c2);
+ } while (--n && c1 && c1 == c2);
return c1 - c2;
}