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:20:30 -0000
@@ -71,13 +71,12 @@ String::String (string const &aString) :
 char const *
 String::c_str () const
 {
-  if (theData->length == 0)
-    return NULL;
   if (theData->cstr)
     delete[] theData->cstr;
   theData->cstr = new char[theData->length + 1];
-  theData->cstr[theData->length] = '\0';
-  memcpy (theData->cstr, theData->theString, theData->length);
+  theData->cstr[theData->length] = '\0';
+  if (theData->length)
+    memcpy (theData->cstr, theData->theString, theData->length);
   return theData->cstr;
 }