diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-18 19:34:33 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-18 19:34:33 +0000 |
| commit | 3624614b45d97fc893e15171c98bcfb2d52ad9d3 (patch) | |
| tree | 236005663bff0012f0da17ed6caf8b5dd301e2fc | |
| parent | 155014c14e8e2855b50f43630edce84143eb9ad2 (diff) | |
Fix crashes in res_odbc.
The variable "class" was being set NULL just prior to
being dereferenced in an ao2_link call. I have moved
the setting of the variable to NULL until after the
ao2_link call.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@165724 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_odbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index 8161fd3bf..5864c7da4 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -699,7 +699,6 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check) ast_mutex_init(&obj->lock); /* obj inherits the outstanding reference to class */ obj->parent = class; - class = NULL; if (odbc_obj_connect(obj) == ODBC_FAIL) { ast_log(LOG_WARNING, "Failed to connect to %s\n", name); ao2_ref(obj, -1); @@ -708,6 +707,7 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check) obj->used = 1; ao2_link(class->obj_container, obj); } + class = NULL; } else { /* Object is not constructed, so delete outstanding reference to class. */ ao2_ref(class, -1); @@ -735,7 +735,6 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check) ast_mutex_init(&obj->lock); /* obj inherits the outstanding reference to class */ obj->parent = class; - class = NULL; if (odbc_obj_connect(obj) == ODBC_FAIL) { ast_log(LOG_WARNING, "Failed to connect to %s\n", name); ao2_ref(obj, -1); @@ -743,6 +742,7 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check) } else { ao2_link(class->obj_container, obj); } + class = NULL; } } |