diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 04:13:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 04:13:57 +0100 |
| commit | ca9d7c57f4b0fde0f1558b44a7bd6c80028b74be (patch) | |
| tree | 699b2cbae810115442a79d629fc344e2f3ecc1b9 | |
| parent | e9b836cd87c2404f4d2d7492ddf982dd446076f8 (diff) | |
| parent | 24eb3c791606fe98a1591c13a8b2ba6c342bb3b5 (diff) | |
| download | ffmpeg-ca9d7c57f4b0fde0f1558b44a7bd6c80028b74be.tar.gz | |
Merge commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5'
* commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5':
rtmpproto: Avoid using uninitialized memory
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtmpproto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index a4d7f0ee73..9a80c2f949 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2511,9 +2511,9 @@ reconnect: (!strcmp(fname + len - 4, ".f4v") || !strcmp(fname + len - 4, ".mp4"))) { memcpy(rt->playpath, "mp4:", 5); - } else if (len >= 4 && !strcmp(fname + len - 4, ".flv")) { - fname[len - 4] = '\0'; } else { + if (len >= 4 && !strcmp(fname + len - 4, ".flv")) + fname[len - 4] = '\0'; rt->playpath[0] = 0; } av_strlcat(rt->playpath, fname, PLAYPATH_MAX_LENGTH); |