mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-21 09:10:36 +00:00
Merged revisions 52808 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r52808 | pcadach | 2007-01-30 00:34:26 -0800 (Втр, 30 Янв 2007) | 1 line Don't play with free()'d pointers ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -363,6 +363,7 @@ static int odbc_register_class(struct odbc_class *class, int connect)
|
|||||||
if (connect) {
|
if (connect) {
|
||||||
/* Request and release builds a connection */
|
/* Request and release builds a connection */
|
||||||
obj = ast_odbc_request_obj(class->name, 0);
|
obj = ast_odbc_request_obj(class->name, 0);
|
||||||
|
if (obj)
|
||||||
ast_odbc_release_obj(obj);
|
ast_odbc_release_obj(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,9 +435,10 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
|
|||||||
ast_mutex_init(&obj->lock);
|
ast_mutex_init(&obj->lock);
|
||||||
obj->parent = class;
|
obj->parent = class;
|
||||||
if (odbc_obj_connect(obj) == ODBC_FAIL) {
|
if (odbc_obj_connect(obj) == ODBC_FAIL) {
|
||||||
ast_log(LOG_WARNING, "Failed to connect\n");
|
ast_log(LOG_WARNING, "Failed to connect to %s\n", name);
|
||||||
ast_mutex_destroy(&obj->lock);
|
ast_mutex_destroy(&obj->lock);
|
||||||
free(obj);
|
free(obj);
|
||||||
|
obj = NULL;
|
||||||
} else {
|
} else {
|
||||||
AST_LIST_INSERT_HEAD(&class->odbc_obj, obj, list);
|
AST_LIST_INSERT_HEAD(&class->odbc_obj, obj, list);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user