Solaris has a broken strftime that produced garbage output for the test

[platform/upstream/glib.git] / gstring.c

diff --git a/gstring.c b/gstring.c
index fa84fe7..312a540 100644 (file)
--- a/gstring.c
+++ b/gstring.c
@@ -16,6 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/* 
+ * MT safe
+ */
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -43,7 +48,7 @@ struct _GRealString
   gint   alloc;
 };
 
-
+static G_LOCK_DEFINE(string_mem_chunk);
 static GMemChunk *string_mem_chunk = NULL;
 
 /* Hash Functions.
@@ -202,12 +207,14 @@ g_string_sized_new (guint dfl_size)
 {
   GRealString *string;
 
+  g_lock (string_mem_chunk);
   if (!string_mem_chunk)
     string_mem_chunk = g_mem_chunk_new ("string mem chunk",
                                        sizeof (GRealString),
                                        1024, G_ALLOC_AND_FREE);
 
   string = g_chunk_new (GRealString, string_mem_chunk);
+  g_unlock (string_mem_chunk);
 
   string->alloc = 0;
   string->len   = 0;
@@ -241,7 +248,9 @@ g_string_free (GString *string,
   if (free_segment)
     g_free (string->str);
 
+  g_lock (string_mem_chunk);
   g_mem_chunk_free (string_mem_chunk, string);
+  g_unlock (string_mem_chunk);
 }
 
 GString*