summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorculler <culler>2020-11-09 13:32:29 (GMT)
committerculler <culler>2020-11-09 13:32:29 (GMT)
commite1bfe977169f9b112ee0a0093eafa78f788629b5 (patch)
treeaaf532a3d66125c185ad747691f7d2b66b3f9fa0 /generic
parent0fc4b2a839f32fc8819246d1c29451f258ee3a8d (diff)
downloadtk-e1bfe977169f9b112ee0a0093eafa78f788629b5.zip
tk-e1bfe977169f9b112ee0a0093eafa78f788629b5.tar.gz
tk-e1bfe977169f9b112ee0a0093eafa78f788629b5.tar.bz2
Fix [f9fa926666] on macOS only: crash when creating a label whose text is a single emoji.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkGet.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/generic/tkGet.c b/generic/tkGet.c
index f2aed2c..989584e 100644
--- a/generic/tkGet.c
+++ b/generic/tkGet.c
@@ -694,6 +694,11 @@ TkGetDoublePixels(
char *end;
double d;
+ if (!tkwin) {
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad screen"));
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "FRACTIONAL_PIXELS", NULL);
+ return TCL_ERROR;
+ }
d = strtod((char *) string, &end);
if (end == string) {
goto error;