From 5f7fd9ae9bfce54b94be8ce21a23efa34be0151d Mon Sep 17 00:00:00 2001 From: David Vossel Date: Tue, 3 May 2011 18:51:41 +0000 Subject: Merged revisions 316215 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r316215 | dvossel | 2011-05-03 13:49:48 -0500 (Tue, 03 May 2011) | 9 lines Fixes a random crash (NULL reference) in res_odbc.c. (closes issue #19180) Reported by: pruiz Patches: tmp.diff uploaded by pruiz (license 1152) Tested by: pruiz, seanbright ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316216 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_odbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res') diff --git a/res/res_odbc.c b/res/res_odbc.c index 1af8bbafd..14cf05368 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -1360,7 +1360,7 @@ struct odbc_obj *_ast_odbc_request_obj2(const char *name, struct ast_flags flags if (obj && ast_test_flag(&flags, RES_ODBC_CONNECTED) && !obj->up) { /* Check if this connection qualifies for reconnection, with negative connection cache time */ - if (time(NULL) > class->last_negative_connect.tv_sec + class->negative_connection_cache.tv_sec) { + if (time(NULL) > obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec) { odbc_obj_connect(obj); } } else if (obj && ast_test_flag(&flags, RES_ODBC_SANITY_CHECK)) { -- cgit v1.2.3