commit 89cb5e0f646970371359c70927bf3a0cdaf47f27
author Bram Moolenaar <Bram@vim.org> Mon Jul 19 20:55:54 2004 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Jul 19 20:55:54 2004 +0000
tree 04cd1d9618940040d50227fbec4d7e03d4355520
parent ab79bcbac383aa26fec23f8610995122a9ff4be6

updated for version 7.0011

src/gui_mac.c

diff --git a/src/gui_mac.c b/src/gui_mac.c
index cf7da53..645e0b5 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -4251,12 +4251,12 @@
 {
 
     Handle	textOfClip;
+    int		flavor = 0;
 #ifdef USE_CARBONIZED
     Size	scrapSize;
     ScrapFlavorFlags	scrapFlags;
     ScrapRef    scrap = nil;
     OSStatus	error;
-    int		flavor;
 #else
     long	scrapOffset;
     long	scrapSize;
@@ -4271,7 +4271,6 @@
     if (error != noErr)
 	return;
 
-    flavor = 0;
     error = GetScrapFlavorFlags(scrap, VIMSCRAPFLAVOR, &scrapFlags);
     if (error == noErr)
     {
@@ -4315,15 +4314,16 @@
 #else
 	scrapSize = GetScrap(textOfClip, 'TEXT', &scrapOffset);
 #endif
+	scrapSize -= flavor;
 
 	if (flavor)
 	    type = **textOfClip;
 	else
 	    type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR;
 
-	tempclip = lalloc(scrapSize+1, TRUE);
-	STRNCPY(tempclip, *textOfClip + flavor, scrapSize - flavor);
-	tempclip[scrapSize - flavor] = 0;
+	tempclip = lalloc(scrapSize + 1, TRUE);
+	STRNCPY(tempclip, *textOfClip + flavor, scrapSize);
+	tempclip[scrapSize] = 0;
 
 	searchCR = (char *)tempclip;
 	while (searchCR != NULL)