summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2009-05-06 16:36:24 (GMT)
committerdas <das>2009-05-06 16:36:24 (GMT)
commit09b826d5ceae5932452b95e44dab0e169fdc0ddd (patch)
treed6c38aff405c340973b03561146c26341d1a5e51
parent007b6e6f8e4b7daa85154046f7ddfb2d706a031e (diff)
downloadtk-09b826d5ceae5932452b95e44dab0e169fdc0ddd.zip
tk-09b826d5ceae5932452b95e44dab0e169fdc0ddd.tar.gz
tk-09b826d5ceae5932452b95e44dab0e169fdc0ddd.tar.bz2
avoid panic for CFStrings longer than INT_MAX
-rw-r--r--macosx/tkMacOSXInit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index f1b41cb..95b1508 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.38 2008/12/15 16:17:18 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.39 2009/05/06 16:36:24 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -581,7 +581,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,