From 07d4aedcaa43e48e5d674fd0ac036726e87cc2c9 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Thu, 13 Oct 2011 02:10:50 -0400
Subject: [PATCH] Construct dispatch registry on first use to avoid static init
 order crash

---
 terminaldispatcher.cpp | 19 +++++++++++++------
 terminaldispatcher.hpp |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/terminaldispatcher.cpp b/terminaldispatcher.cpp
index fd2cb81..7a23217 100644
--- a/terminaldispatcher.cpp
+++ b/terminaldispatcher.cpp
@@ -118,19 +118,26 @@ std::string Dispatcher::str( void )
   return std::string( assum );
 }
 
+/* construct on first use to avoid static initialization order crash */
+DispatchRegistry & Terminal::get_global_dispatch_registry( void )
+{
+  static DispatchRegistry global_dispatch_registry;
+  return global_dispatch_registry;
+}
+
 static void register_function( Function_Type type,
 			       std::string dispatch_chars,
 			       Function f )
 {
   switch ( type ) {
   case ESCAPE:
-    global_dispatch_registry.escape.insert( dispatch_map_t::value_type( dispatch_chars, f ) );
+    get_global_dispatch_registry().escape.insert( dispatch_map_t::value_type( dispatch_chars, f ) );
     break;
   case CSI:
-    global_dispatch_registry.CSI.insert( dispatch_map_t::value_type( dispatch_chars, f ) );
+    get_global_dispatch_registry().CSI.insert( dispatch_map_t::value_type( dispatch_chars, f ) );
     break;
   case CONTROL:
-    global_dispatch_registry.control.insert( dispatch_map_t::value_type( dispatch_chars, f ) );
+    get_global_dispatch_registry().control.insert( dispatch_map_t::value_type( dispatch_chars, f ) );
     break;
   }
 }
@@ -156,9 +163,9 @@ void Dispatcher::dispatch( Function_Type type, const Parser::Action *act, Frameb
 
   dispatch_map_t *map = NULL;
   switch ( type ) {
-  case ESCAPE:  map = &global_dispatch_registry.escape;  break;
-  case CSI:     map = &global_dispatch_registry.CSI;     break;
-  case CONTROL: map = &global_dispatch_registry.control; break;
+  case ESCAPE:  map = &get_global_dispatch_registry().escape;  break;
+  case CSI:     map = &get_global_dispatch_registry().CSI;     break;
+  case CONTROL: map = &get_global_dispatch_registry().control; break;
   }
 
   std::string key = dispatch_chars;
diff --git a/terminaldispatcher.hpp b/terminaldispatcher.hpp
index 5189373..714645c 100644
--- a/terminaldispatcher.hpp
+++ b/terminaldispatcher.hpp
@@ -45,7 +45,7 @@ namespace Terminal {
     DispatchRegistry() : escape(), CSI(), control() {}
   };
 
-  static DispatchRegistry global_dispatch_registry;
+  DispatchRegistry & get_global_dispatch_registry( void );
 
   class Dispatcher {
   private: