From 84be80698227366d970e045001e4b59e4f99f0a1 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Sun, 12 May 2013 13:37:33 +0200
Subject: [PATCH] lavu: define FF_MEMORY_POISON and use it
Allow single-place definition of constant used to fill poisoned memory.
---
libavutil/buffer.c | 2 +-
libavutil/internal.h | 2 ++
libavutil/mem.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index a5fc8d7009e..e9bf54b96c7 100644
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -288,7 +288,7 @@ static void pool_release_buffer(void *opaque, uint8_t *data)
AVBufferPool *pool = buf->pool;
if(CONFIG_MEMORY_POISONING)
- memset(buf->data, 0x2a, pool->size);
+ memset(buf->data, FF_MEMORY_POISON, pool->size);
add_to_pool(buf);
if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1))
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 76018a8a2f7..c5835fb4f86 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -66,6 +66,8 @@
# define INT_BIT (CHAR_BIT * sizeof(int))
#endif
+#define FF_MEMORY_POISON 0x2a
+
// Some broken preprocessors need a second expansion
// to be forced to tokenize __VA_ARGS__
#define E1(x) x
diff --git a/libavutil/mem.c b/libavutil/mem.c
index 03bf2c8607b..9b22609d6fe 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -133,7 +133,7 @@ void *av_malloc(size_t size)
}
#if CONFIG_MEMORY_POISONING
if (ptr)
- memset(ptr, 0x2a, size);
+ memset(ptr, FF_MEMORY_POISON, size);
#endif
return ptr;
}
--
GitLab