Index: String++.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/String++.cc,v
retrieving revision 2.17
diff -p -u -r2.17 String++.cc
--- String++.cc	1 Sep 2005 15:42:15 -0000	2.17
+++ String++.cc	14 Mar 2006 00:02:45 -0000
@@ -289,9 +289,11 @@ String::replace (String const &pattern, 
 char *
 new_cstr_char_array (const String &s)
 {
-  size_t len = s.size() + 1;
-  char *buf = new char[len];
-  memcpy (buf, s.c_str (), len);
+  size_t len = s.size();
+  char *buf = new char[len + 1];
+  if (len)
+    memcpy (buf, s.c_str (), len);
+  buf[len] = 0;
   return buf;
 }