OBS User unknown 2008-05-07 20:05:28 +00:00 committed by Git OBS Bridge
parent 9eb183b545
commit 4a2f10d784
3 changed files with 33 additions and 1 deletions

23
tcl-dictcrash.patch Normal file
View File

@ -0,0 +1,23 @@
--- generic/tclCompCmds.c
+++ generic/tclCompCmds.c
@@ -1215,7 +1215,7 @@
tokenPtr = TokenAfter(tokenPtr);
}
if (parsePtr->numWords > 4) {
- TclEmitInstInt1(INST_CONCAT1, parsePtr->numWords-2, envPtr);
+ TclEmitInstInt1(INST_CONCAT1, parsePtr->numWords-3, envPtr);
}
/*
--- tests/dict.test
+++ tests/dict.test
@@ -414,6 +414,9 @@
catch {unset dictVar}
set result
} {1 {can't set "dictVar": variable is array}}
+test dict-13.10 {compiled dict append: crash case} {
+ apply {{} {dict append dictVar a o k}}
+} {a ok}
test dict-14.1 {dict for command: syntax} {
list [catch {dict for} msg] $msg

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 7 11:44:53 CEST 2008 - max@suse.de
- Added a fix and a test for a crash in the [dict append] command.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 7 21:15:17 CEST 2008 - max@suse.de Mon Apr 7 21:15:17 CEST 2008 - max@suse.de

View File

@ -14,7 +14,7 @@
Name: tcl Name: tcl
Url: http://www.tcl.tk Url: http://www.tcl.tk
Version: 8.5.2 Version: 8.5.2
Release: 4 Release: 9
%define TCL_MINOR %(echo %version | cut -c1-3) %define TCL_MINOR %(echo %version | cut -c1-3)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: The Tcl Programming Language Summary: The Tcl Programming Language
@ -29,6 +29,7 @@ Source2: baselibs.conf
Source3: macros.tcl Source3: macros.tcl
Patch0: tcl.patch Patch0: tcl.patch
Patch1: tcl-format.patch Patch1: tcl-format.patch
Patch2: tcl-dictcrash.patch
%description %description
Tcl (Tool Command Language) is a very powerful but easy to learn Tcl (Tool Command Language) is a very powerful but easy to learn
@ -71,6 +72,7 @@ Authors:
%setup -q -n %name%version %setup -q -n %name%version
%patch0 %patch0
%patch1 %patch1
%patch2
%build %build
cd unix cd unix
@ -146,6 +148,8 @@ exit 0
%_libdir/tclConfig.sh %_libdir/tclConfig.sh
%changelog %changelog
* Wed May 07 2008 max@suse.de
- Added a fix and a test for a crash in the [dict append] command.
* Mon Apr 07 2008 max@suse.de * Mon Apr 07 2008 max@suse.de
- Added /etc/rpm/macros.tcl - Added /etc/rpm/macros.tcl
- Fixed behaviour of "%% d" format string. - Fixed behaviour of "%% d" format string.