From: Nathan Sidwell <nathan@codesourcery.com>
Date: Thu, 12 Apr 2001 07:47:34 +0000 (+0000)
Subject: eh_alloc.cc (__cxa_allocate_exception): Don't terminate holding the mutex.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f847167e3d5c4864f64bd950a6a0d478a6730def;p=gcc.git

eh_alloc.cc (__cxa_allocate_exception): Don't terminate holding the mutex.

	* libsupc++/eh_alloc.cc (__cxa_allocate_exception): Don't
	terminate holding the mutex. Make sure size fits in EMERGENCY_OBJ_SIZE.

From-SVN: r41296
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 588e8d8d6b2..50cf9ecb3b2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* libsupc++/eh_alloc.cc (__cxa_allocate_exception): Don't
+	terminate holding the mutex. Make sure size fits in EMERGENCY_OBJ_SIZE.
+
 2001-04-12  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* testsuite/README: Add DejaGnu specific documentation.
diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
index 61dc75d159b..bbaa6f694a0 100644
--- a/libstdc++-v3/libsupc++/eh_alloc.cc
+++ b/libstdc++-v3/libsupc++/eh_alloc.cc
@@ -113,19 +113,24 @@ __cxa_allocate_exception(std::size_t thrown_size)
       bitmask_type used = emergency_used;
       unsigned int which = 0;
 
+      if (thrown_size > EMERGENCY_OBJ_SIZE)
+	goto failed;
       while (used & 1)
 	{
 	  used >>= 1;
 	  if (++which >= EMERGENCY_OBJ_COUNT)
-	    std::terminate ();
+	    goto failed;
 	}
 
       emergency_used |= (bitmask_type)1 << which;
       ret = &emergency_buffer[which][0];
 
+    failed:;
 #ifdef __GTHREADS
       __gthread_mutex_unlock (&emergency_mutex);
 #endif
+      if (!ret)
+	std::terminate ();
     }
 
   memset (ret, 0, sizeof (__cxa_exception));