diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-01-23 00:30:00 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-01-23 00:30:00 +0000 |
| commit | 22ae23eed37ebd194025d0dd72b675ffcef70dc1 (patch) | |
| tree | 9c9137d897d0b343b55b18d98ba295447aeddd53 /main/astobj2.c | |
| parent | 945fc670f9e00028523385ed9e7efedc49d45fa3 (diff) | |
Attempt to be more helpful when using a bad ao2 object pointer.
Put the external obj pointer in the message instead of the internal version.
........
Merged revisions 379963 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 379964 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/astobj2.c')
| -rw-r--r-- | main/astobj2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 50e81cfc2..e1fb81b76 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -159,10 +159,12 @@ static inline struct astobj2 *INTERNAL_OBJ(void *user_data) p = (struct astobj2 *) ((char *) user_data - sizeof(*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); + ast_log(LOG_ERROR, "bad magic number 0x%x for object %p\n", + p->priv_data.magic, user_data); } else { ast_log(LOG_ERROR, - "bad magic number for %p. Object is likely destroyed.\n", p); + "bad magic number for object %p. Object is likely destroyed.\n", + user_data); } return NULL; } |