mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-05 23:11:11 +02:00
Code Releases Activity

26260: fix crash failing to assigns scalar to special hash

Browse source
This commit is contained in:
Peter Stephenson 2009-01-08 13:12:06 +00:00
parent bb883ca78f
commit d69bd194b9
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-01-08 Peter Stephenson <pws@csr.com>
* 26260: Src/params.c: fix crash when failing to assign
scalar to special hash.
2009-01-06 Peter Stephenson <pws@csr.com> 2009-01-06 Peter Stephenson <pws@csr.com>
* unposted: Doc/Zsh/mod_stat.yo: fix yodl problem with 26229. * unposted: Doc/Zsh/mod_stat.yo: fix yodl problem with 26229.

15
Src/params.c
View file

@ -495,10 +495,10 @@ scancountparams(UNUSED(HashNode hn), int flags)
static Patprog scanprog; static Patprog scanprog;
static char *scanstr; static char *scanstr;
static char **paramvals; static char **paramvals;
static Param foundparam; static Param foundparam;
/**/ /**/
void static void
scanparamvals(HashNode hn, int flags) scanparamvals(HashNode hn, int flags)
{ {
struct value v; struct value v;
@ -538,6 +538,7 @@ scanparamvals(HashNode hn, int flags)
--numparamvals; /* Value didn't match, discard key */ --numparamvals; /* Value didn't match, discard key */
} else } else
++numparamvals; ++numparamvals;
foundparam = NULL;
} }
/**/ /**/
@ -2270,7 +2271,15 @@ setstrvalue(Value v, char *val)
break; break;
case PM_HASHED: case PM_HASHED:
{ {
foundparam->gsu.s->setfn(foundparam, val); if (foundparam == NULL)
{
zerr("%s: attempt to set associative array to scalar",
v->pm->node.nam);
zsfree(val);
return;
}
else
foundparam->gsu.s->setfn(foundparam, val);
} }
break; break;
} }