summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2013-12-03 19:28:21 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2013-12-03 19:28:21 +0200
commitab687d3d21453ec4db88ccd29d4bc2993abb24e4 (patch)
treeb46e6a0b51993934b29d974205af5816e7b43ac8
parent6989a45747fbd88762bce2e6de47db982e1810e9 (diff)
parent522a4d02e3f87607dfcda0c7c391ea2c1f40813e (diff)
merge
-rwxr-xr-xindra/llwindow/llwindowmacosx-objc.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 0768d0352e..ace1ec0e73 100755
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -91,7 +91,7 @@ const unsigned short *copyFromPBoard()
NSArray *objToPaste = [pboard readObjectsForClasses:classArray options:[NSDictionary dictionary]];
str = [objToPaste objectAtIndex:0];
}
- unichar* temp = (unichar*)calloc([str length], sizeof(unichar));
+ unichar* temp = (unichar*)calloc([str length]+1, sizeof(unichar));
[str getCharacters:temp];
[pool release];
return temp;