summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-01-11 22:08:59 (GMT)
committerhobbs <hobbs>2000-01-11 22:08:59 (GMT)
commitdba4ade20672f9434ee5f1c871cc0e3454dc6fd0 (patch)
treee0ed0df0d95c75b6ebbf3e1d7269c0165c1e8d48
parent40c309568a00ef2f5cd2db5618f02f075d9cda5b (diff)
downloadtcl-dba4ade20672f9434ee5f1c871cc0e3454dc6fd0.zip
tcl-dba4ade20672f9434ee5f1c871cc0e3454dc6fd0.tar.gz
tcl-dba4ade20672f9434ee5f1c871cc0e3454dc6fd0.tar.bz2
* generic/tclUtf.c: changed Tcl_UtfBackslash to not allow
non-octal digits (8,9) in \ooo substs. [Bug: 3975] * generic/tcl.h: noted need to change win/tcl.m4 and tools/tclSplash.bmp for minor version changes
-rw-r--r--generic/tcl.h11
-rw-r--r--generic/tclFileName.c8
-rw-r--r--generic/tclUtf.c11
3 files changed, 21 insertions, 9 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index bc56bb6..2deee7c 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.60 1999/12/21 23:58:03 hobbs Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.61 2000/01/11 22:08:59 hobbs Exp $
*/
#ifndef _TCL
@@ -41,6 +41,7 @@ extern "C" {
* library/init.tcl (only if Major.minor changes, not patchlevel) 1 LOC
* unix/configure.in (2 LOC Major, 2 LOC minor, 1 LOC patch)
* win/configure.in (as above)
+ * win/tcl.m4 (not patchlevel)
* win/makefile.vc (not patchlevel) 2 LOC
* win/pkgIndex.tcl (not patchlevel, for tclregNN.dll)
* README (sections 0 and 2)
@@ -51,6 +52,7 @@ extern "C" {
* tests/basic.test (not patchlevel) (version checks)
* tools/tcl.hpj.in (not patchlevel, for windows installer)
* tools/tcl.wse.in (for windows installer)
+ * tools/tclSplash.bmp (not patchlevel)
*/
#define TCL_MAJOR_VERSION 8
@@ -276,6 +278,13 @@ extern "C" {
# define CONST
#endif
+/*
+ * Make sure EXTERN isn't defined elsewhere
+ */
+#ifdef EXTERN
+#undef EXTERN
+#endif /* EXTERN */
+
#ifdef __cplusplus
# define EXTERN extern "C" TCL_STORAGE_CLASS
#else
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index cee1901..19920cd 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclFileName.c,v 1.7 1999/12/12 22:46:42 hobbs Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.8 2000/01/11 22:08:59 hobbs Exp $
*/
#include "tclInt.h"
@@ -1652,9 +1652,9 @@ TclGlob(interp, pattern, unquotedPrefix, globFlags, types)
* the user name anymore (Vince Darley, June 1999), since the
* new code is designed to handle special chars.
*/
- #ifndef NOT_NEEDED_ANYMORE
+#ifndef NOT_NEEDED_ANYMORE
head = DoTildeSubst(interp, start+1, &buffer);
- #else
+#else
if (strpbrk(start+1, "\\[]*?{}") == NULL) {
head = DoTildeSubst(interp, start+1, &buffer);
@@ -1666,7 +1666,7 @@ TclGlob(interp, pattern, unquotedPrefix, globFlags, types)
}
head = NULL;
}
- #endif
+#endif
*tail = c;
if (head == NULL) {
if (globFlags & GLOBMODE_NO_COMPLAIN) {
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 8a2354e..5fe3c41 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.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: tclUtf.c,v 1.10 1999/07/22 01:08:05 redman Exp $
+ * RCS: @(#) $Id: tclUtf.c,v 1.11 2000/01/11 22:09:00 hobbs Exp $
*/
#include "tclInt.h"
@@ -864,16 +864,19 @@ Tcl_UtfBackslash(src, readPtr, dst)
count = 1;
break;
default:
- if (isdigit(UCHAR(*p))) { /* INTL: digit */
+ /*
+ * Check for an octal number \oo?o?
+ */
+ if (isdigit(UCHAR(*p)) && (UCHAR(*p) < '8')) { /* INTL: digit */
result = (unsigned char)(*p - '0');
p++;
- if (!isdigit(UCHAR(*p))) { /* INTL: digit */
+ if (!isdigit(UCHAR(*p)) || (UCHAR(*p) >= '8')) { /* INTL: digit */
break;
}
count = 3;
result = (unsigned char)((result << 3) + (*p - '0'));
p++;
- if (!isdigit(UCHAR(*p))) { /* INTL: digit */
+ if (!isdigit(UCHAR(*p)) || (UCHAR(*p) >= '8')) { /* INTL: digit */
break;
}
count = 4;