summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclEncoding.c28
2 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2626be6..dddef85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-03-13 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclEncoding.c: Report error when an escape encoding
+ is missing one of its sub-encodings [Bug 506653].
+
* unix/configure.in: Revert change from 2005-07-26 that sometimes
* unix/configure: added $prefix/share to the tcl_pkgPath.
See [Patch 1231015]. autoconf-2.59.
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 1e2e8fe..e8cd2e8 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEncoding.c,v 1.39 2006/02/08 21:41:27 dgp Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.40 2006/03/13 20:57:39 dgp Exp $
*/
#include "tclInt.h"
@@ -1564,6 +1564,9 @@ LoadEncodingFile(
}
if ((encoding == NULL) && (interp != NULL)) {
Tcl_AppendResult(interp, "invalid encoding file \"", name, "\"", NULL);
+ if (ch == 'E') {
+ Tcl_AppendResult(interp, " or missing sub-encoding", NULL);
+ }
}
Tcl_Close(NULL, chan);
@@ -1879,7 +1882,7 @@ LoadEscapeEncoding(
CONST char *name, /* Name for new encoding. */
Tcl_Channel chan) /* File containing new encoding. */
{
- int i;
+ int i, missingSubEncoding = 0;
unsigned int size;
Tcl_DString escapeData;
char init[16], final[16];
@@ -1924,18 +1927,26 @@ LoadEscapeEncoding(
est.name[sizeof(est.name) - 1] = '\0';
/*
- * To avoid infinite recursion in [encoding system iso2022-*]
+ * Load the subencodings first so we're never stuck
+ * trying to use a half-loaded system encoding to
+ * open/read a *.enc file.
*/
- Tcl_GetEncoding(NULL, est.name);
-
- est.encodingPtr = NULL;
+ est.encodingPtr = (Encoding *) Tcl_GetEncoding(NULL, est.name);
+ if ((est.encodingPtr == NULL)
+ || (est.encodingPtr->toUtfProc != TableToUtfProc)) {
+ missingSubEncoding = 1;
+ }
Tcl_DStringAppend(&escapeData, (char *) &est, sizeof(est));
}
}
ckfree((char *) argv);
Tcl_DStringFree(&lineString);
}
+ if (missingSubEncoding) {
+ Tcl_DStringFree(&escapeData);
+ return NULL;
+ }
size = sizeof(EscapeEncodingData) - sizeof(EscapeSubTable)
+ Tcl_DStringLength(&escapeData);
@@ -3162,6 +3173,11 @@ GetTableEncoding(
encodingPtr = subTablePtr->encodingPtr;
if (encodingPtr == NULL) {
+ /*
+ * Now that escape encodings load their sub-encodings first, and
+ * fail to load if any sub-encodings are missing, this branch should
+ * never happen.
+ */
encodingPtr = (Encoding *) Tcl_GetEncoding(NULL, subTablePtr->name);
if ((encodingPtr == NULL)
|| (encodingPtr->toUtfProc != TableToUtfProc)) {