Ensure the connection gets marked as used at allocation time (closes issue #10429, report and fix by mnicholson)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@79142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Tilghman Lesher 18 years ago
parent 241769b53c
commit d0489c9f50

@ -413,8 +413,16 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
}
ast_mutex_init(&obj->lock);
obj->parent = class;
odbc_obj_connect(obj);
AST_LIST_INSERT_TAIL(&class->odbc_obj, obj, list);
if (odbc_obj_connect(obj) == ODBC_FAIL) {
ast_log(LOG_WARNING, "Failed to connect to %s\n", name);
ast_mutex_destroy(&obj->lock);
free(obj);
obj = NULL;
class->count--;
} else {
obj->used = 1;
AST_LIST_INSERT_TAIL(&class->odbc_obj, obj, list);
}
}
} else {
/* Non-pooled connection: multiple modules can use the same connection. */

Loading…
Cancel
Save