[Opalvoip-svn] SF.net SVN: opalvoip:[34858] ptlib/trunk

[<rjo...@us...>]

Revision: 34858
          http://sourceforge.net/p/opalvoip/code/34858
Author:   rjongbloed
Date:     2016-07-05 10:22:38 +0000 (Tue, 05 Jul 2016)
Log Message:
-----------
Merged revision(s) 34856-34857 from ptlib/branches/v2_16:
Fixed another race condition handling auto delete threads, thanks Derek Smithies

Modified Paths:
--------------
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx

Property Changed:
----------------
    ptlib/trunk/

Index: ptlib/trunk
===================================================================
--- ptlib/trunk	2016-07-05 10:21:19 UTC (rev 34857)
+++ ptlib/trunk	2016-07-05 10:22:38 UTC (rev 34858)

Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -6,7 +6,7 ##
 /ptlib/branches/v2_10:25177-29189,32921,32947
 /ptlib/branches/v2_12:28485-31603
 /ptlib/branches/v2_14:31501-33720
-/ptlib/branches/v2_16:34085-34855
+/ptlib/branches/v2_16:34085-34857
 /ptlib/branches/v2_2:20746,20791,20827,22014,22942
 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
\ No newline at end of property
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2016-07-05 10:21:19 UTC (rev 34857)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2016-07-05 10:22:38 UTC (rev 34858)
@@ -324,9 +324,10 @@
 
   PProcess & process = PProcess::Current();
   process.OnThreadEnded(*this);
+
+  PX_state = PX_finished;
   process.InternalThreadEnded(this);
-
-  PX_state = PX_finished; // Must be last thing to avoid races
+  // "this" may have been deleted at this point
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.