From d4604d10fe728f3954b294c0a4373b6df65f4ec9 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Mon, 29 Oct 2012 16:39:13 +0100
Subject: lavu/parseutils: add trailing characters check in
 av_parse_video_size()

Return an error in case the video size specifications contains spurious
trailing chars, like in "320x240foobar".
---
 libavutil/parseutils.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libavutil')

diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 0a7a6225db..a335978cc1 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -143,6 +143,10 @@ int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str)
         if (*p)
             p++;
         height = strtol(p, (void*)&p, 10);
+
+        /* trailing extraneous data detected, like in 123x345foobar */
+        if (*p)
+            return AVERROR(EINVAL);
     }
     if (width <= 0 || height <= 0)
         return AVERROR(EINVAL);
-- 
cgit v1.2.3