[FFmpeg-cvslog] avformat/rtmpproto: add FFMIN() to av_strlcpy()
Michael Niedermayer
git at videolan.org
Thu May 8 19:39:01 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 8 18:19:38 2014 +0200| [0c2a6dabced53b4df57aedf47f0c1b8233035fed] | committer: Michael Niedermayer
avformat/rtmpproto: add FFMIN() to av_strlcpy()
Suggested-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c2a6dabced53b4df57aedf47f0c1b8233035fed
---
libavformat/rtmpproto.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index c8544ef..2883bb0 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2482,12 +2482,12 @@ reconnect:
if (qmark && strstr(qmark, "slist=")) {
char* amp;
// After slist we have the playpath, before the params, the app
- av_strlcpy(rt->app, path + 1, qmark - path);
+ av_strlcpy(rt->app, path + 1, FFMIN(qmark - path, APP_MAX_LENGTH));
fname = strstr(path, "slist=") + 6;
// Strip any further query parameters from fname
amp = strchr(fname, '&');
if (amp) {
- av_strlcpy(fname_buffer, fname, amp - fname + 1);
+ av_strlcpy(fname_buffer, fname, FFMIN(amp - fname + 1, sizeof(fname_buffer)));
fname = fname_buffer;
}
} else if (!strncmp(path, "/ondemand/", 10)) {
More information about the ffmpeg-cvslog
mailing list