virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

* Bad buffer management bug. Forgot to take care of the case

Browse Source 
where doubling the size of the buffer is not enough.

Originally committed as revision 633 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Philip Gladstone
2002-05-30 20:37:51 +00:00
parent fca0f0e59f
commit 31def22984
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffserver.c
View File

@@ -1317,13 +1317,21 @@ static void http_write_packet(void *opaque,
c->buffer_ptr = c->buffer_end = c->buffer; c->buffer_ptr = c->buffer_end = c->buffer;
if (c->buffer_end - c->buffer + size > c->buffer_size) { if (c->buffer_end - c->buffer + size > c->buffer_size) {
UINT8 *new_buffer = av_malloc(c->buffer_size * 2); int new_buffer_size = c->buffer_size * 2;
UINT8 *new_buffer;
if (new_buffer_size <= c->buffer_end - c->buffer + size) {
new_buffer_size = c->buffer_end - c->buffer + size + c->buffer_size;
}
new_buffer = av_malloc(new_buffer_size);
if (new_buffer) { if (new_buffer) {
memcpy(new_buffer, c->buffer, c->buffer_end - c->buffer); memcpy(new_buffer, c->buffer, c->buffer_end - c->buffer);
c->buffer_end += (new_buffer - c->buffer); c->buffer_end += (new_buffer - c->buffer);
c->buffer_ptr += (new_buffer - c->buffer); c->buffer_ptr += (new_buffer - c->buffer);
av_free(c->buffer); av_free(c->buffer);
c->buffer = new_buffer; c->buffer = new_buffer;
c->buffer_size = new_buffer_size;
} else { } else {
av_abort(); av_abort();
} }