projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61fdbf7
)
librtmp: append the correct field to the string
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Sun, 16 Nov 2014 23:22:22 +0000
(
00:22
+0100)
committer
Luca Barbato
<lu_zero@gentoo.org>
Mon, 12 Jan 2015 23:16:41 +0000
(
00:16
+0100)
Also prevent a NULL pointer dereference.
CC: libav-stable@libav.org
Bug-Id: CID 1250329 / CID 1250331
(cherry picked from commit
a28468d0daf4be14761c16a3ddd33266b2380123
)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/librtmp.c
patch
|
blob
|
history
diff --git
a/libavformat/librtmp.c
b/libavformat/librtmp.c
index
74e2c49
..
fac3a35
100644
(file)
--- a/
libavformat/librtmp.c
+++ b/
libavformat/librtmp.c
@@
-169,7
+169,7
@@
static int rtmp_open(URLContext *s, const char *uri, int flags)
}
if (ctx->swfurl) {
av_strlcat(filename, " swfUrl=", len);
- av_strlcat(filename, ctx->
page
url, len);
+ av_strlcat(filename, ctx->
swf
url, len);
}
if (ctx->flashver) {
av_strlcat(filename, " flashVer=", len);