Attempt to be more helpful when using a bad ao2 object pointer.

Backport of -r360626 with some enhancements.  Put the external obj pointer
in the message instead of the internal version.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@379963 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/astobj2.c b/main/astobj2.c
index 02fff97f223123a7f1f04baee24b456488b6ff32..c390198686712e22e663d75e0e7e1133f77bb4c1 100644 (file)
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -117,9 +117,16 @@ 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);
-               p = NULL;
+       if (AO2_MAGIC != p->priv_data.magic) {
+               if (p->priv_data.magic) {
+                       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 object %p. Object is likely destroyed.\n",
+                               user_data);
+               }
+               return NULL;
        }
 
        return p;