aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-05-08 15:12:23 +0300
committerReinhard Tartler <siretart@tauware.de>2014-05-08 20:00:47 -0400
commit7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a (patch)
tree98b0c593e18a3729f1c37a8763c1f67fbf99967e
parenta56a9e65c6a17dd8b6303dd45bdc3e3368093092 (diff)
downloadffmpeg-7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a.tar.gz
rtmpproto: Check the buffer sizes when copying app/playpath strings
As pointed out by Reimar Döffinger. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e) Conflicts: libavformat/rtmpproto.c
-rw-r--r--libavformat/rtmpproto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index bc6a4fef69..ead5ccd57a 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2483,10 +2483,10 @@ reconnect:
fname = strchr(p + 1, '/');
if (!fname || (c && c < fname)) {
fname = p + 1;
- av_strlcpy(rt->app, path + 1, p - path);
+ av_strlcpy(rt->app, path + 1, FFMIN(p - path, APP_MAX_LENGTH));
} else {
fname++;
- av_strlcpy(rt->app, path + 1, fname - path - 1);
+ av_strlcpy(rt->app, path + 1, FFMIN(fname - path - 1, APP_MAX_LENGTH));
}
}
}