sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

talloc: change TALLOC_MAGIC for version 2.0.0

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-07-02 10:48:24 +02:00 committed by Andrew Tridgell
parent 0fcd465340
commit f1dbd58a99
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/talloc/talloc.c
View File

@ -57,7 +57,9 @@
#define MAX_TALLOC_SIZE 0x10000000
#define TALLOC_MAGIC 0xe814ec70
#define TALLOC_MAGIC_V1 0xe814ec70
#define TALLOC_MAGIC_V2 0xe814ec80
#define TALLOC_MAGIC TALLOC_MAGIC_V2
#define TALLOC_FLAG_FREE 0x01
#define TALLOC_FLAG_LOOP 0x02
#define TALLOC_FLAG_POOL 0x04 /* This is a talloc pool */
@ -155,6 +157,11 @@ static void talloc_abort(const char *reason)
talloc_abort_fn(reason);
}
static void talloc_abort_magic_v1(void)
{
talloc_abort("Bad talloc magic value - old magic v1 used");
}
static void talloc_abort_double_free(void)
{
talloc_abort("Bad talloc magic value - double free");
@ -171,6 +178,10 @@ static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
const char *pp = (const char *)ptr;
struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp - TC_HDR_SIZE);
if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC)) {
if ((tc->flags & (~0xF)) == TALLOC_MAGIC_V1) {
talloc_abort_magic_v1();
}
if (tc->flags & TALLOC_FLAG_FREE) {
talloc_abort_double_free();
} else {