Module: libav Branch: master Commit: 4b7304e80d5f4312e34a748e6c34eb6a7346af7b
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Wed May 16 11:45:47 2012 +0300 rtmp: Don't assume path points to a string of nonzero length If using the new -rtmp_app and -rtmp_playpath parameters, one can in many cases set the main url to just rtmp://server/. If the trailing slash is omitted, path is a string of zero length, and using path+1 will end up reading uninitialized data. Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/rtmpproto.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 427655c..1b86c44 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -895,9 +895,10 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) fname = path + 10; memcpy(rt->app, "ondemand", 9); } else { - char *p = strchr(path + 1, '/'); + char *next = *path ? path + 1 : path; + char *p = strchr(next, '/'); if (!p) { - fname = path + 1; + fname = next; rt->app[0] = '\0'; } else { char *c = strchr(p + 1, ':'); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
