Index: src/FbTk/Font.cc
===================================================================
RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/Font.cc,v
retrieving revision 1.11
diff -a -b -B -p -u -r1.11 Font.cc
--- src/FbTk/Font.cc	18 Aug 2004 16:30:33 -0000	1.11
+++ src/FbTk/Font.cc	25 Aug 2004 08:52:31 -0000
@@ -94,10 +94,13 @@ char* recode(iconv_t cd,
                     const char *msg, size_t size) {
 
     // If empty message, yes this can happen, return
-    if(strlen(msg) == 0) 
+    if(strlen(msg) == 0 || size == 0) 
         return 0;
 
-    size_t inbytesleft = strlen(msg);
+    if(strlen(msg) < size)
+        size = strlen(msg);
+    
+    size_t inbytesleft = size; //strlen(msg);
     size_t outbytesleft = 4*inbytesleft;
     char *new_msg = new char[outbytesleft];
     char *new_msg_ptr = new_msg;