84c3800cdc
growstackblock() sometimes relocates a stack_block considered empty without properly relocating stack marks referencing that block. The first call to popstackmark() with the unrelocated stack mark as argument then causes sh to abort. Relocating the relevant stack marks seems to solve this problem. The patch changes the semantics of popstackmark() somewhat. It can only be called once after a call to setstackmark(), thus cmdloop() in main.c needs an extra call to setstackmark(). PR: bin/19983 Submitted by: Tor.Egge@fast.no Reviewed by: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
81 lines
3.2 KiB
C
81 lines
3.2 KiB
C
/*-
|
|
* Copyright (c) 1991, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Kenneth Almquist.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)memalloc.h 8.2 (Berkeley) 5/4/95
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
struct stackmark {
|
|
struct stack_block *stackp;
|
|
char *stacknxt;
|
|
int stacknleft;
|
|
struct stackmark *marknext;
|
|
};
|
|
|
|
|
|
extern char *stacknxt;
|
|
extern int stacknleft;
|
|
extern int sstrnleft;
|
|
extern int herefd;
|
|
|
|
pointer ckmalloc __P((int));
|
|
pointer ckrealloc __P((pointer, int));
|
|
char *savestr __P((char *));
|
|
pointer stalloc __P((int));
|
|
void stunalloc __P((pointer));
|
|
void setstackmark __P((struct stackmark *));
|
|
void popstackmark __P((struct stackmark *));
|
|
void growstackblock __P((void));
|
|
void grabstackblock __P((int));
|
|
char *growstackstr __P((void));
|
|
char *makestrspace __P((void));
|
|
void ungrabstackstr __P((char *, char *));
|
|
|
|
|
|
|
|
#define stackblock() stacknxt
|
|
#define stackblocksize() stacknleft
|
|
#define STARTSTACKSTR(p) p = stackblock(), sstrnleft = stackblocksize()
|
|
#define STPUTC(c, p) (--sstrnleft >= 0? (*p++ = (c)) : (p = growstackstr(), *p++ = (c)))
|
|
#define CHECKSTRSPACE(n, p) { if (sstrnleft < n) p = makestrspace(); }
|
|
#define USTPUTC(c, p) (--sstrnleft, *p++ = (c))
|
|
#define STACKSTRNUL(p) (sstrnleft == 0? (p = growstackstr(), *p = '\0') : (*p = '\0'))
|
|
#define STUNPUTC(p) (++sstrnleft, --p)
|
|
#define STTOPC(p) p[-1]
|
|
#define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount))
|
|
#define grabstackstr(p) stalloc(stackblocksize() - sstrnleft)
|
|
|
|
#define ckfree(p) free((pointer)(p))
|