From d576b37fa7e2d23737f04b6c1df2a132ff4b113f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 4 Oct 2021 16:44:46 +0200 Subject: [PATCH] avutil/buffer: Never poison returned buffers Poisoning returned buffers is based around the implicit assumption that the contents of said buffers are transient. Yet this is not true for the buffer pools used by the various hardware contexts which store important state in there that needs to be preserved. Furthermore, the current code is also based on the assumption that the complete buffer pointed to by AVBuffer->data coincides with AVBufferRef->data; yet an implementation might store some data of its own before the actual user-visible data (accessible via AVBufferRef) which would be broken by the current code. (This is of course yet more proof that the AVBuffer API is not the right tool for the hardware contexts.) Signed-off-by: Andreas Rheinhardt --- libavutil/buffer.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavutil/buffer.c b/libavutil/buffer.c index 54590be566..e4562a79b1 100644 --- a/libavutil/buffer.c +++ b/libavutil/buffer.c @@ -341,9 +341,6 @@ static void pool_release_buffer(void *opaque, uint8_t *data) BufferPoolEntry *buf = opaque; AVBufferPool *pool = buf->pool; - if(CONFIG_MEMORY_POISONING) - memset(buf->data, FF_MEMORY_POISON, pool->size); - ff_mutex_lock(&pool->mutex); buf->next = pool->pool; pool->pool = buf;