mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-08-11 15:01:16 +02:00
Code Releases Activity

typeset: Fix leaving corrupted entries in paramtab

Browse source
This commit is contained in:
Mikael Magnusson 2020-06-05 15:39:04 +02:00
parent a44f44d6e6
commit ed23768f77
2 changed files with 14 additions and 3 deletions

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-06-05 Mikael Magnusson <mikachu@gmail.com>
* 45985: Src/builtin.c: typeset: Fix leaving corrupted entries
in paramtab
2020-06-03 Yasuhiro KIMURA <yasu@utahime.org> 2020-06-03 Yasuhiro KIMURA <yasu@utahime.org>
* 45950: configure.ac: Fix 'make install' in out-of-tree * 45950: configure.ac: Fix 'make install' in out-of-tree

12
Src/builtin.c
View file

@ -2480,12 +2480,16 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func),
return NULL; return NULL;
} }
if (on & (PM_LEFT | PM_RIGHT_B | PM_RIGHT_Z)) { if (on & (PM_LEFT | PM_RIGHT_B | PM_RIGHT_Z)) {
if (typeset_setwidth(cname, pm, ops, on, 0)) if (typeset_setwidth(cname, pm, ops, on, 0)) {
unsetparam_pm(pm, 0, 1);
return NULL; return NULL;
}
} }
if (on & (PM_INTEGER | PM_EFLOAT | PM_FFLOAT)) { if (on & (PM_INTEGER | PM_EFLOAT | PM_FFLOAT)) {
if (typeset_setbase(cname, pm, ops, on, 0)) if (typeset_setbase(cname, pm, ops, on, 0)) {
unsetparam_pm(pm, 0, 1);
return NULL; return NULL;
}
} }
} else { } else {
if (idigit(*pname)) if (idigit(*pname))
@ -2503,8 +2507,10 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func),
*/ */
struct tieddata *tdp = (struct tieddata *) struct tieddata *tdp = (struct tieddata *)
zalloc(sizeof(struct tieddata)); zalloc(sizeof(struct tieddata));
if (!tdp) if (!tdp) {
unsetparam_pm(pm, 0, 1);
return NULL; return NULL;
}
tdp->joinchar = joinchar; tdp->joinchar = joinchar;
tdp->arrptr = &altpm->u.arr; tdp->arrptr = &altpm->u.arr;