# 
# 
# patch "ChangeLog"
#  from [36ddfbc60c098baecae82e3be37bb02055100506]
#    to [d51fb51d72026507ffa47cbfe8364aaa5a8c98c6]
# 
# patch "sanity.cc"
#  from [b31758131617cacbc373a95c25cab49e15ffedc3]
#    to [36f79a9ba2cf13f0f96eb85a36ee0ca1619c39df]
# 
============================================================
--- ChangeLog	36ddfbc60c098baecae82e3be37bb02055100506
+++ ChangeLog	d51fb51d72026507ffa47cbfe8364aaa5a8c98c6
@@ -1,3 +1,10 @@
+2006-02-13  Matthew Gregan  <address@hidden>
+
+	* sanity.cc (sanity::dump_buffer): Fix a SEGV when we're in an
+	error unwind and about to ask the user to mail us the crash
+	log--we must use FL() rather than F() here, since by the time this
+	is called we can't rely on the i18n infrastructure being alive.
+
 2006-02-12  Nathaniel Smith  <address@hidden>
 
 	* netsync.cc (serve_connections): Revert garbage that I
============================================================
--- sanity.cc	b31758131617cacbc373a95c25cab49e15ffedc3
+++ sanity.cc	36f79a9ba2cf13f0f96eb85a36ee0ca1619c39df
@@ -51,12 +51,12 @@
         {
           copy(logbuf.begin(), logbuf.end(), ostream_iterator<char>(out));
           copy(gasp_dump.begin(), gasp_dump.end(), ostream_iterator<char>(out));
-          ui.inform((F("wrote debugging log to %s\n"
-                       "if reporting a bug, please include this file")
-                     % filename).str());
+          ui.inform((FL("wrote debugging log to %s\n"
+                        "if reporting a bug, please include this file")
+                       % filename).str());
         }
       else
-        ui.inform((F("failed to write debugging log to %s\n") % filename).str());
+        ui.inform((FL("failed to write debugging log to %s\n") % filename).str());
     }
   else
     ui.inform("discarding debug log (maybe you want --debug or --dump?)");