--- JSON-XS/XS.xs	2007/04/06 21:17:09	1.26
+++ JSON-XS/XS.xs	2007/04/11 12:23:02	1.28
@@ -33,7 +33,6 @@
 #define INIT_SIZE   32 // initial scalar size to be allocated
 #define INDENT_STEP 3  // spaces per indentation level
 
-#define UTF8_MAX_LEN      11 // for perls UTF-X: max. number of octets per character
 #define SHORT_STRING_LEN 512 // special-case strings of up to this size
 
 #define SB do {
@@ -111,7 +110,7 @@
       STRLEN cur = enc->cur - SvPVX (enc->sv);
       SvGROW (enc->sv, cur + len + 1);
       enc->cur = SvPVX (enc->sv) + cur;
-      enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);
+      enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
     }
 }
 
@@ -218,7 +217,7 @@
                     }
                   else
                     {
-                      need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
+                      need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
                       enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
                       ++str;
                     }
@@ -521,6 +520,7 @@
     SvUTF8_on (enc.sv);
 
   SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
+  *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
 
   if (enc.flags & F_SHRINK)
     shrink (enc.sv);
@@ -602,7 +602,7 @@
 
   do
     {
-      char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
+      char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
       char *cur = buf;
 
       do