JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix stateptr-underflow; really do call fastbox regression checks; bump vsn

Browse Source
This commit is contained in:
tg 2011-11-26 00:45:21 +00:00
parent 12608d7933
commit 0695039dc0
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/Makefile,v 1.89 2011/11/25 23:29:30 tg Exp $ # $MirOS: src/bin/mksh/Makefile,v 1.90 2011/11/26 00:45:17 tg Exp $
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Thorsten Glaser <tg@mirbsd.org> # Thorsten Glaser <tg@mirbsd.org>
@ -70,7 +70,7 @@ regress: ${PROG} check.pl check.t
mkdir -p regress-dir mkdir -p regress-dir
echo export FNORD=666 >regress-dir/.mkshrc echo export FNORD=666 >regress-dir/.mkshrc
HOME=$$(realpath regress-dir) perl ${.CURDIR}/check.pl \ HOME=$$(realpath regress-dir) perl ${.CURDIR}/check.pl \
-s ${.CURDIR}/check.t -v -p ./${PROG} -s ${.CURDIR}/check.t -v -p ./${PROG} -C fastbox
test-build: .PHONY test-build: .PHONY
-rm -rf build-dir -rm -rf build-dir

9
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.495 2011/11/25 23:33:42 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.496 2011/11/26 00:45:18 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -25,7 +25,7 @@
# http://www.research.att.com/~gsf/public/ifs.sh # http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R40 2011/11/21 @(#)MIRBSD KSH R40 2011/11/25
description: description:
Check version of shell. Check version of shell.
stdin: stdin:
@ -9603,10 +9603,9 @@ expected-stdout:
b b
x x
--- ---
name: alloc-overflow-1 name: stateptr-underflow
description: description:
This check overflows mksh R40 memory allocation This check overflows an Xrestpos stored in a short in R40
unless 't=$t' is changed to 't+='
category: fastbox category: fastbox
stdin: stdin:
function Lb64decode { function Lb64decode {

4
eval.c
View File

@ -22,7 +22,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.109 2011/10/11 19:06:07 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.110 2011/11/26 00:45:20 tg Exp $");
/* /*
* string expansion * string expansion
@ -189,8 +189,8 @@ typedef struct SubType {
struct tbl *var; /* variable for ${var..} */ struct tbl *var; /* variable for ${var..} */
struct SubType *prev; /* old type */ struct SubType *prev; /* old type */
struct SubType *next; /* poped type (to avoid re-allocating) */ struct SubType *next; /* poped type (to avoid re-allocating) */
size_t base; /* begin position of expanded word */
short stype; /* [=+-?%#] action after expanded word */ short stype; /* [=+-?%#] action after expanded word */
short base; /* begin position of expanded word */
short f; /* saved value of f (DOPAT, etc) */ short f; /* saved value of f (DOPAT, etc) */
uint8_t quotep; /* saved value of quote (for ${..[%#]..}) */ uint8_t quotep; /* saved value of quote (for ${..[%#]..}) */
uint8_t quotew; /* saved value of quote (for ${..[+-=]..}) */ uint8_t quotew; /* saved value of quote (for ${..[+-=]..}) */

4
sh.h
View File

@ -151,9 +151,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.504 2011/11/22 18:01:40 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.505 2011/11/26 00:45:21 tg Exp $");
#endif #endif
#define MKSH_VERSION "R40 2011/11/21" #define MKSH_VERSION "R40 2011/11/25"
#ifndef MKSH_INCLUDES_ONLY #ifndef MKSH_INCLUDES_ONLY