Attachment "tk-XLFD.patch" to
ticket [2236352f]
added by
thyrsus
2008-11-08 07:16:53.
diff -ru tk8.4.17/generic/tkFont.c tk8.4.17-fixed/generic/tkFont.c
--- tk8.4.17/generic/tkFont.c 2007-05-31 09:39:26.000000000 -0400
+++ tk8.4.17-fixed/generic/tkFont.c 2008-11-07 19:06:54.000000000 -0500
@@ -3369,12 +3369,19 @@
}
if (FieldSpecified(field[XLFD_FOUNDRY])) {
- xaPtr->foundry = Tk_GetUid(field[XLFD_FOUNDRY]);
+ if ((xaPtr->foundry = Tk_GetUid(field[XLFD_FOUNDRY])) == NULL) {
+ return TCL_ERROR;
+ }
}
if (FieldSpecified(field[XLFD_FAMILY])) {
- faPtr->family = Tk_GetUid(field[XLFD_FAMILY]);
+ if ((faPtr->family = Tk_GetUid(field[XLFD_FAMILY])) == NULL) {
+ return TCL_ERROR;
+ }
+ } else {
+ return TCL_ERROR; /* XLFD_FAMILY is mandatory */
}
+
if (FieldSpecified(field[XLFD_WEIGHT])) {
faPtr->weight = TkFindStateNum(NULL, NULL, xlfdWeightMap,
field[XLFD_WEIGHT]);
@@ -3457,9 +3464,13 @@
/* XLFD_AVERAGE_WIDTH ignored. */
if (FieldSpecified(field[XLFD_CHARSET])) {
- xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]);
+ if ((xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]))==NULL) {
+ return TCL_ERROR;
+ }
} else {
- xaPtr->charset = Tk_GetUid("iso8859-1");
+ if ((xaPtr->charset = Tk_GetUid("iso8859-1"))==NULL) {
+ return TCL_ERROR;
+ }
}
Tcl_DStringFree(&ds);
return TCL_OK;