diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b4130637bcef27d9071bc5601fde64466bdbc8a..401de258290732e4b03b72aeb51187d48de3646b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-06  Andrew Pinski  <apinski@apple.com>
+
+	* config/darwin.c (machopic_non_lazy_ptr_name): Fix off by one
+	error in calculating the length of the string.
+	(machopic_stub_name): Likewise.
+
 2003-10-06  Roger Sayle  <roger@eyesopen.com>
 
 	* optabs.c (prepare_float_lib_cmp):  Attach a REG_EQUAL note
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 4d62ea0d730b24e8be70eeba3dfa525e60726246..a548d3106970ce78b392530899a18b90e32c385b 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -311,7 +311,7 @@ machopic_non_lazy_ptr_name (const char *name)
       {
 	buffer[bufferlen] = '_';
 	memcpy (buffer + bufferlen +1, name, namelen+1);
-        bufferlen += namelen;
+        bufferlen += namelen +1;
       }
 
     memcpy (buffer + bufferlen, "$non_lazy_ptr", strlen("$non_lazy_ptr")+1);
@@ -386,7 +386,7 @@ machopic_stub_name (const char *name)
       {
 	buffer[bufferlen] = '_';
 	memcpy (buffer + bufferlen +1, name, namelen+1);
-        bufferlen += namelen;
+        bufferlen += namelen +1;
       }
 
     if (needs_quotes)