summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2009-05-06 16:36:28 (GMT)
committerdas <das>2009-05-06 16:36:28 (GMT)
commit17870f6d9fd45524f08ad067e0ad7a57a9fed719 (patch)
tree66544cca926556c8357866f9946a4a4fe88cef64 /macosx
parent96ceda29303fa98217d4b1a6ab3bdd5dc02c7c19 (diff)
downloadtk-17870f6d9fd45524f08ad067e0ad7a57a9fed719.zip
tk-17870f6d9fd45524f08ad067e0ad7a57a9fed719.tar.gz
tk-17870f6d9fd45524f08ad067e0ad7a57a9fed719.tar.bz2
avoid panic for CFStrings longer than INT_MAX
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e54938b..2eaa883 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXInit.c,v 1.34.2.2 2008/06/19 00:13:10 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.34.2.3 2009/05/06 16:36:28 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -584,7 +584,7 @@ TkMacOSXGetStringObjFromCFString(
CFIndex len;
if (CFStringGetBytes(str, all, kCFStringEncodingUTF8, 0, false, NULL,
- 0, &len) > 0) {
+ 0, &len) > 0 && len < INT_MAX) {
obj = Tcl_NewObj();
Tcl_SetObjLength(obj, len);
CFStringGetBytes(str, all, kCFStringEncodingUTF8, 0, false,