diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:04:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:07:05 +0200 |
| commit | cd6f5c4895c49b483542030324ea5198521ab28b (patch) | |
| tree | c1ae5a95d3b19de827e98270ff060124086c4414 /libavformat/http.c | |
| parent | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (diff) | |
| parent | 6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 (diff) | |
Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702':
swscale: Do not make ff_ symbols globally visible.
rtspdec: use av_strlcpy for writing into fixed size buffer
g722enc: fix size argument in memset
http: use av_strlcpy instead of strcpy() without size checks
avfilter: correct memcpy size avfilter_copy_buf_props()
lavc: split asv12 encoder/decoder
Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index a8076b2020..8665452c35 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -322,7 +322,7 @@ static int process_line(URLContext *h, char *line, int line_count, while (isspace(*p)) p++; if (!av_strcasecmp(tag, "Location")) { - strcpy(s->location, p); + av_strlcpy(s->location, p, sizeof(s->location)); *new_location = 1; } else if (!av_strcasecmp (tag, "Content-Length") && s->filesize == -1) { s->filesize = strtoll(p, NULL, 10); |