From: Jason Parker <jparker@digium.com>
Date: Wed, 20 Jun 2007 22:32:57 +0000 (+0000)
Subject: Merged revisions 70554 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5d03568e56c6c672e3bf409cd7997ef7fbd6121;p=thirdparty%2Fasterisk.git

Merged revisions 70554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r70554 | qwell | 2007-06-20 17:31:35 -0500 (Wed, 20 Jun 2007) | 4 lines

Fix a race condition in cdr_pgsql that can occur when reloading the module.

Issue 10022, patch by me, with credit to prashant_jois for finding the bug.

........


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

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 09df1bfd74..ac0373cb20 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -309,8 +309,12 @@ static int unload_module(void)
 
 static int reload(void)
 {
+	int res;
+	ast_mutex_lock(&pgsql_lock);
 	my_unload_module();
-	return my_load_module();
+	res = my_load_module();
+	ast_mutex_lock(&pgsql_lock);
+	return res;
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CDR Backend",