[Pkg-voip-commits] r9851 - in /kamailio/trunk/debian: changelog patches/series patches/upstream/ patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Tue Jun 26 06:35:53 2012
New Revision: 9851

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9851
Log:
upstream fix

Added:
    kamailio/trunk/debian/patches/upstream/
    kamailio/trunk/debian/patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/patches/series

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9851&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue Jun 26 06:35:53 2012
@@ -14,6 +14,7 @@
     + multiarch support.
   * debian/patches:
     + remove all patches.
+    + added upstream fixes.
     + no_lib64_on_64_bits.patch ( used on squeeze backport)
     + multiarch_support.patch
     + added no_INSTALL_file.patch
@@ -25,7 +26,7 @@
   * debian/backports
     + added squeeze script
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 20 Jun 2012 09:02:00 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Tue, 26 Jun 2012 08:33:17 +0200
 
 kamailio (1.5.1-2) unstable; urgency=low
 

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9851&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Tue Jun 26 06:35:53 2012
@@ -1,2 +1,3 @@
+upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch
 multiarch_support.patch
 no_INSTALL_file.patch

Added: kamailio/trunk/debian/patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch?rev=9851&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch Tue Jun 26 06:35:53 2012
@@ -1,0 +1,40 @@
+From 33a2157ec034c106e5a4bd42aa874e57550a13fe Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Mon, 25 Jun 2012 18:36:18 +0200
+Subject: [PATCH] dialog(k): proper unlock of profile for mi list command
+
+- the profile was unlocked in a wrong place, before finishing listing
+  the its content and could cause a race in accessing it
+- reported by Ricardo Martinez
+(cherry picked from commit 3a2e929c63c656fe2db78e746546af05c66740ea)
+---
+ modules_k/dialog/dlg_profile.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c
+index 70ec2c5..3317216 100644
+--- a/modules_k/dialog/dlg_profile.c
++++ b/modules_k/dialog/dlg_profile.c
+@@ -845,8 +845,8 @@ struct mi_root * mi_profile_list(struct mi_root *cmd_tree, void *param )
+ 					ph=ph->next;
+ 				}while( ph!=profile->entries[i].first );
+ 			}
+-			lock_release( &profile->lock );
+ 		}
++		lock_release( &profile->lock );
+ 	} else {
+ 		/* check for value also */
+ 		lock_get( &profile->lock );
+@@ -864,8 +864,8 @@ struct mi_root * mi_profile_list(struct mi_root *cmd_tree, void *param )
+ 					ph=ph->next;
+ 				}while( ph!=profile->entries[i].first );
+ 			}
+-			lock_release( &profile->lock );
+ 		}
++		lock_release( &profile->lock );
+ 	}
+ 
+ 	return rpl_tree;
+-- 
+1.7.9.5
+