external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00
Code Issues Releases Wiki Activity

Fix segmentation fault for justified strings (re: bdb99741) (#190)

Browse source 
Additional adjustments to previous commit bdb9974 to correct
crashes when the max size of a justified string is requested.
This commit corrects the following:

Before (Ubuntu 64bit):
$ typeset -L $(((1<<31)-1)) s=h; typeset +p s
Segmentation fault (core dumped)

After:
$ typeset -L $(((1<<31)-1)) s=h; typeset +p s
typeset -L 2147483647 s

src/cmd/ksh93/sh/name.c: nv_putval():
- Alter the variables size, dot, and append from int to unsigned
  int to prevent unwanted negative values from being expressed.
- By creating size, dot, and append as unsigned ints; (unsigned)
  type casting is avoided.
This commit is contained in:
hyenias 2021-02-21 04:34:18 -05:00 committed by GitHub
parent 51b2e360fa
commit 0ce0b67149
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cmd/ksh93/sh/name.c
View file

@ -1573,7 +1573,7 @@ void nv_putval(register Namval_t *np, const char *string, int flags)
Shell_t *shp = sh_getinterp(); Shell_t *shp = sh_getinterp();
register const char *sp=string; register const char *sp=string;
register union Value *up; register union Value *up;
register int size = 0; register unsigned int size = 0;
int was_local = nv_local; int was_local = nv_local;
union Value u; union Value u;
#if SHOPT_FIXEDARRAY #if SHOPT_FIXEDARRAY
@ -1874,8 +1874,8 @@ void nv_putval(register Namval_t *np, const char *string, int flags)
else else
{ {
char *cp = NIL(char*); /* pointer to new string */ char *cp = NIL(char*); /* pointer to new string */
int dot; /* attribute or type length; defaults to string length */ unsigned int dot; /* attribute or type length; defaults to string length */
int append = 0; /* offset for appending */ unsigned int append = 0; /* offset for appending */
if(sp==up->cp && !(flags&NV_APPEND)) if(sp==up->cp && !(flags&NV_APPEND))
return; return;
dot = strlen(sp); dot = strlen(sp);
@ -1955,11 +1955,11 @@ void nv_putval(register Namval_t *np, const char *string, int flags)
{ {
if(tofree && tofree!=Empty && tofree!=Null) if(tofree && tofree!=Empty && tofree!=Null)
{ {
cp = (char*)realloc((void*)tofree,((unsigned)dot+append+1)); cp = (char*)realloc((void*)tofree, dot+append+1);
tofree = 0; tofree = 0;
} }
else else
cp = (char*)malloc(((unsigned)dot+append+1)); cp = (char*)malloc(dot+append+1);
cp[dot+append] = 0; cp[dot+append] = 0;
nv_offattr(np,NV_NOFREE); nv_offattr(np,NV_NOFREE);
} }