summaryrefslogtreecommitdiff
path: root/libavformat/rtmphttp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-26 16:37:02 +0300
committerMartin Storsjö <martin@martin.st>2013-09-26 23:14:03 +0300
commitd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 (patch)
tree92ef865da60624c41be1e58c505c95508662ad7d /libavformat/rtmphttp.c
parent06ebc0bf9a6401733a4ce1310325de19f631819a (diff)
downloadffmpeg-d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9.tar.gz
lavf: Reset the entry count and allocation size variables on av_reallocp failures
When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtmphttp.c')
-rw-r--r--libavformat/rtmphttp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c
index 5de1857a28..89a661435c 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);