diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-03-27 17:00:13 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-03-27 17:00:13 +0000 |
| commit | 8611bea1224288c972a7b289ee1d18a5fa2001a4 (patch) | |
| tree | ddba2b7ad009696e1df37cc6dd3667d7f1c21f03 /main/astobj2.c | |
| parent | 65f56cda7a2c9f8334530da595eece021bac1872 (diff) | |
Attempt to be more helpful when using a bad ao2 object pointer.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/astobj2.c')
| -rw-r--r-- | main/astobj2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index d0643fe5b..32758cfd0 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -142,8 +142,13 @@ static inline struct astobj2 *INTERNAL_OBJ(void *user_data) } p = (struct astobj2 *) ((char *) user_data - sizeof(*p)); - if (AO2_MAGIC != (p->priv_data.magic) ) { - ast_log(LOG_ERROR, "bad magic number 0x%x for %p\n", p->priv_data.magic, p); + if (AO2_MAGIC != p->priv_data.magic) { + if (p->priv_data.magic) { + ast_log(LOG_ERROR, "bad magic number 0x%x for %p\n", p->priv_data.magic, p); + } else { + ast_log(LOG_ERROR, + "bad magic number for %p. Object is likely destroyed.\n", p); + } return NULL; } |