diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 14:13:41 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 14:13:41 +0400 |
commit | 72eddc10fa1f3ca7fb95292673fa26401f754c92 (patch) | |
tree | 878039cdab1f882bc68a9e60203e430d42eb8d54 /libavformat/rtmphttp.c | |
parent | 328a5b93d3a493d6a653a83c425fb2cc98e8f41b (diff) | |
parent | d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 (diff) |
Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
lavf: Reset the entry count and allocation size variables on av_reallocp failures
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmphttp.c')
-rw-r--r-- | libavformat/rtmphttp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c index 6302304572..49909ee8fd 100644 --- a/libavformat/rtmphttp.c +++ b/libavformat/rtmphttp.c @@ -89,8 +89,11 @@ static int rtmp_http_write(URLContext *h, const uint8_t *buf, int size) if (rt->out_size + size > rt->out_capacity) { int err; rt->out_capacity = (rt->out_size + size) * 2; - if ((err = av_reallocp(&rt->out_data, rt->out_capacity)) < 0) + if ((err = av_reallocp(&rt->out_data, rt->out_capacity)) < 0) { + rt->out_size = 0; + rt->out_capacity = 0; return err; + } } memcpy(rt->out_data + rt->out_size, buf, size); |