X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Favsscanf.c;h=b7f0f71c2d5e1837acb4d60a6d0135d8ce412eb4;hb=2fdfad552569621c9d672370032aab17a17ff0e6;hp=1c85412fd4d5945a4332fbd43f9551baf5a9da8d;hpb=e427ba5c68a522b26a45bf7c61016d9349fab43d;p=ffmpeg

diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c
index 1c85412fd4d..b7f0f71c2d5 100644
--- a/libavutil/avsscanf.c
+++ b/libavutil/avsscanf.c
@@ -113,7 +113,7 @@ static int ffshgetc(FFFILE *f)
 }
 
 #define shlim(f, lim) ffshlim((f), (lim))
-#define shgetc(f) (((f)->rpos != (f)->shend) ? *(f)->rpos++ : ffshgetc(f))
+#define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : ffshgetc(f))
 #define shunget(f) ((f)->shend ? (void)(f)->rpos-- : (void)0)
 
 static const unsigned char table[] = { -1,
@@ -229,9 +229,9 @@ static long long scanexp(FFFILE *f, int pok)
         return LLONG_MIN;
     }
     for (x=0; c-'0'<10U && x<INT_MAX/10; c = shgetc(f))
-        x = 10*x + c-'0';
+        x = 10*x + (c-'0');
     for (y=x; c-'0'<10U && y<LLONG_MAX/100; c = shgetc(f))
-        y = 10*y + c-'0';
+        y = 10*y + (c-'0');
     for (; c-'0'<10U; c = shgetc(f));
     shunget(f);
     return neg ? -y : y;