From 5748e6d4d9d5128c368a0c98a585225aa890939f Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Fri, 16 Nov 2012 14:37:08 -0500
Subject: [PATCH] Bug 806830: Enforce initializing strlib before using r=ehugg

---
 media/webrtc/signaling/src/sipcc/core/common/init.c           | 2 ++
 media/webrtc/signaling/src/sipcc/core/includes/string_lib.h   | 1 +
 media/webrtc/signaling/src/sipcc/core/src-common/string_lib.c | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/media/webrtc/signaling/src/sipcc/core/common/init.c b/media/webrtc/signaling/src/sipcc/core/common/init.c
index f64e393be999..87770c6c0749 100755
--- a/media/webrtc/signaling/src/sipcc/core/common/init.c
+++ b/media/webrtc/signaling/src/sipcc/core/common/init.c
@@ -211,6 +211,8 @@ ccInit ()
 
     platInit();
 
+    strlib_init();
+
     /*
      * below should move to cprPreInit. keep it here until then
      */
diff --git a/media/webrtc/signaling/src/sipcc/core/includes/string_lib.h b/media/webrtc/signaling/src/sipcc/core/includes/string_lib.h
index acdabc90a4ae..1efb231c7d03 100755
--- a/media/webrtc/signaling/src/sipcc/core/includes/string_lib.h
+++ b/media/webrtc/signaling/src/sipcc/core/includes/string_lib.h
@@ -42,6 +42,7 @@ string_t strlib_empty(void);
 void strlib_debug_init(void);
 long strlib_mem_used(void);
 int strlib_test_memory_is_string(void *mem);
+void strlib_init (void);
 
 #ifndef __STRINGLIB_INTERNAL__
 #define strlib_malloc(x,y) strlib_malloc(x,y,__FILE__,__LINE__)
diff --git a/media/webrtc/signaling/src/sipcc/core/src-common/string_lib.c b/media/webrtc/signaling/src/sipcc/core/src-common/string_lib.c
index c24dad282f60..b3db1232cf6f 100755
--- a/media/webrtc/signaling/src/sipcc/core/src-common/string_lib.c
+++ b/media/webrtc/signaling/src/sipcc/core/src-common/string_lib.c
@@ -379,3 +379,8 @@ strlib_empty (void)
     return (empty_str);
 }
 
+void
+strlib_init (void)
+{
+  (void) strlib_empty(); // force it to allocate the empty string buffer
+}
-- 
2.11.4.GIT