[asterisk-commits] mnicholson: branch 1.6.2 r228859 - in /branches/1.6.2: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Nov  9 08:48:56 2009
New Revision: 228859

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228859
Log:
Merged revisions 228858 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r228858 | mnicholson | 2009-11-09 08:37:07 -0600 (Mon, 09 Nov 2009) | 15 lines
  
  Merged revisions 228827 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r228827 | mnicholson | 2009-11-09 08:16:03 -0600 (Mon, 09 Nov 2009) | 8 lines
    
    Perform limited bounds checking when destroying ast_mutex_t structures to make sure we don't try to use negative indices.
    
    (closes issue #15588)
    Reported by: zerohalo
    Patches:
          20090820__issue15588.diff.txt uploaded by tilghman (license 14)
    Tested by: zerohalo
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/include/asterisk/lock.h

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/include/asterisk/lock.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/lock.h?view=diff&rev=228859&r1=228858&r2=228859
==============================================================================
--- branches/1.6.2/include/asterisk/lock.h (original)
+++ branches/1.6.2/include/asterisk/lock.h Mon Nov  9 08:48:56 2009
@@ -408,6 +408,7 @@
 #define ast_mutex_init_notracking(pmutex) \
 	__ast_pthread_mutex_init(0, __FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex)
 
+#define	ROFFSET	((lt->reentrancy > 0) ? (lt->reentrancy-1) : 0)
 static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *func,
 						const char *mutex_name, ast_mutex_t *t)
 {
@@ -445,9 +446,9 @@
 				   filename, lineno, func, mutex_name);
 		ast_reentrancy_lock(lt);
 		__ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n",
-			    lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name);
-#ifdef HAVE_BKTR
-		__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
+			    lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name);
+#ifdef HAVE_BKTR
+		__dump_backtrace(&lt->backtrace[ROFFSET], canlog);
 #endif
 		ast_reentrancy_unlock(lt);
 		break;
@@ -538,10 +539,10 @@
 					__dump_backtrace(&lt->backtrace[lt->reentrancy], canlog);
 #endif
 					__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
-							   lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1],
-							   lt->func[lt->reentrancy-1], mutex_name);
-#ifdef HAVE_BKTR
-					__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
+							   lt->file[ROFFSET], lt->lineno[ROFFSET],
+							   lt->func[ROFFSET], mutex_name);
+#ifdef HAVE_BKTR
+					__dump_backtrace(&lt->backtrace[ROFFSET], canlog);
 #endif
 					ast_reentrancy_unlock(lt);
 					reported_wait = wait_time;
@@ -687,13 +688,13 @@
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
 
 	ast_reentrancy_lock(lt);
-	if (lt->reentrancy && (lt->thread[lt->reentrancy-1] != pthread_self())) {
+	if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) {
 		__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
 				   filename, lineno, func, mutex_name);
 		__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
-				   lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name);
-#ifdef HAVE_BKTR
-		__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
+				   lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name);
+#ifdef HAVE_BKTR
+		__dump_backtrace(&lt->backtrace[ROFFSET], canlog);
 #endif
 		DO_THREAD_CRASH;
 	}
@@ -784,13 +785,13 @@
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
 
 	ast_reentrancy_lock(lt);
-	if (lt->reentrancy && (lt->thread[lt->reentrancy-1] != pthread_self())) {
+	if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) {
 		__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
 				   filename, lineno, func, mutex_name);
 		__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
-				   lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name);
-#ifdef HAVE_BKTR
-		__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
+				   lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name);
+#ifdef HAVE_BKTR
+		__dump_backtrace(&lt->backtrace[ROFFSET], canlog);
 #endif
 		DO_THREAD_CRASH;
 	}
@@ -882,13 +883,13 @@
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
 
 	ast_reentrancy_lock(lt);
-	if (lt->reentrancy && (lt->thread[lt->reentrancy-1] != pthread_self())) {
+	if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) {
 		__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
 				   filename, lineno, func, mutex_name);
 		__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
-				   lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name);
-#ifdef HAVE_BKTR
-		__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
+				   lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name);
+#ifdef HAVE_BKTR
+		__dump_backtrace(&lt->backtrace[ROFFSET], canlog);
 #endif
 		DO_THREAD_CRASH;
 	}