empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(xdeval): Passed uninitialized val->val_as.sym.len to nstr_exec_val(),

Browse source 
which broke NSC_STRINGY.  Initialize from new parameter len.  Callers
changed.
This commit is contained in:
Markus Armbruster 2006-02-11 07:25:28 +00:00
parent 87528230f2
commit c50c2d2518
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lib/commands/xdump.c
View file

@ -86,13 +86,16 @@
* PTR points to the context object. * PTR points to the context object.
* The attribute is stored there at offset OFF + IDX * S, where S is * The attribute is stored there at offset OFF + IDX * S, where S is
* its size. * its size.
* LEN is the #array elements if it is an array, else zero.
*/ */
static struct valstr * static struct valstr *
xdeval(struct valstr *val, nsc_type type, void *ptr, ptrdiff_t off, int idx) xdeval(struct valstr *val,
nsc_type type, void *ptr, ptrdiff_t off, int idx, int len)
{ {
val->val_type = type; val->val_type = type;
val->val_cat = NSC_OFF; val->val_cat = NSC_OFF;
val->val_as.sym.off = off; val->val_as.sym.off = off;
val->val_as.sym.len = len;
val->val_as.sym.idx = idx; val->val_as.sym.idx = idx;
nstr_exec_val(val, player->cnum, ptr, NSC_NOTYPE); nstr_exec_val(val, player->cnum, ptr, NSC_NOTYPE);
return val; /* FIXME nstr_exec_val() should return VAL */ return val; /* FIXME nstr_exec_val() should return VAL */
@ -158,7 +161,7 @@ xdflds(struct castr ca[], void *ptr)
n = ca[i].ca_type != NSC_STRINGY ? ca[i].ca_len : 0; n = ca[i].ca_type != NSC_STRINGY ? ca[i].ca_len : 0;
j = 0; j = 0;
do { do {
xdeval(&val, ca[i].ca_type, ptr, ca[i].ca_off, j); xdeval(&val, ca[i].ca_type, ptr, ca[i].ca_off, j, ca[i].ca_len);
sep = xdprval(&val, sep); sep = xdprval(&val, sep);
} while (++j < n); } while (++j < n);
} }
@ -362,11 +365,11 @@ xdver(int meta)
return RET_OK; return RET_OK;
} }
xdeval(&val, vers_ca.ca_type, version, 0, 0); xdeval(&val, vers_ca.ca_type, version, vers_ca.ca_off, 0, vers_ca.ca_len);
sep = xdprval(&val, ""); sep = xdprval(&val, "");
for (kp = configkeys; kp->km_key; ++kp) { for (kp = configkeys; kp->km_key; ++kp) {
if (kp->km_type != NSC_NOTYPE && !(kp->km_flags & KM_INTERNAL)) { if (kp->km_type != NSC_NOTYPE && !(kp->km_flags & KM_INTERNAL)) {
xdeval(&val, kp->km_type, kp->km_data, 0, 0); xdeval(&val, kp->km_type, kp->km_data, 0, 0, 0);
sep = xdprval(&val, sep); sep = xdprval(&val, sep);
} }
} }