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

Plug memory leaks:

Browse source 
(freeflds): New.
(xundump): Call it.
(xuloadrow): Leave freeing storage to freeflds().
(xuflds): Ensure values[] is terminated with a VAL_NOTUSED element
even on error.
This commit is contained in:
Markus Armbruster 2005-12-01 19:12:54 +00:00
parent 33912952bb
commit 656b726a24
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/lib/common/xundump.c
View file

@ -112,6 +112,7 @@ xuflds(FILE *fp, struct value values[])
char buf[1024]; char buf[1024];
for (i = 0; i < MAX_NUM_COLUMNS; i++) { for (i = 0; i < MAX_NUM_COLUMNS; i++) {
values[i].v_type = VAL_NOTUSED;
ch = getc(fp); ch = getc(fp);
ungetc(ch, fp); ungetc(ch, fp);
@ -139,12 +140,12 @@ xuflds(FILE *fp, struct value values[])
return gripe("Junk in field %d", i + 1); return gripe("Junk in field %d", i + 1);
} }
if (!strcmp(buf, "nil")) { if (!strcmp(buf, "nil")) {
values[i].v_field.v_string = NULL;
values[i].v_type = VAL_STRING; values[i].v_type = VAL_STRING;
values[i].v_field.v_string = NULL;
} }
else { else {
values[i].v_field.v_string = strdup(buf);
values[i].v_type = VAL_SYMBOL; values[i].v_type = VAL_SYMBOL;
values[i].v_field.v_string = strdup(buf);
} }
} }
if (sep == '\n') if (sep == '\n')
@ -162,6 +163,17 @@ xuflds(FILE *fp, struct value values[])
return i; return i;
} }
static void
freeflds(struct value values[])
{
struct value *vp;
for (vp = values; vp->v_type != VAL_NOTUSED; vp++) {
if (vp->v_type != VAL_DOUBLE)
free(vp->v_field.v_string);
}
}
static int static int
xunsymbol(struct castr *ca, char *buf) xunsymbol(struct castr *ca, char *buf)
{ {
@ -245,7 +257,6 @@ xuloadrow(int type, int row, struct value values[])
values[j].v_field.v_string, ca[i].ca_name)); values[j].v_field.v_string, ca[i].ca_name));
values[j].v_field.v_double = values[j].v_field.v_double =
(double)xunsymbol(&ca[i], values[j].v_field.v_string); (double)xunsymbol(&ca[i], values[j].v_field.v_string);
free(values[i].v_field.v_string);
if (values[j].v_field.v_double < 0.0) if (values[j].v_field.v_double < 0.0)
return -1; return -1;
/* /*
@ -393,7 +404,7 @@ xundump(FILE *fp, char *file, int expected_table)
{ {
char name[64]; char name[64];
char sep; char sep;
int row, rows, ch; int row, res, rows, ch;
struct value values[MAX_NUM_COLUMNS + 1]; struct value values[MAX_NUM_COLUMNS + 1];
int type; int type;
int fixed_rows; int fixed_rows;
@ -438,17 +449,20 @@ xundump(FILE *fp, char *file, int expected_table)
* TODO * TODO
* Add column count check to the return value of xuflds() * Add column count check to the return value of xuflds()
*/ */
if (xuflds(fp, values) <= 0) res = xuflds(fp, values);
return -1; if (res > 0 && row >= empfile[type].csize - 1) {
else { gripe("Too many rows for table %s", name);
if (row >= empfile[type].csize - 1) res = -1;
return gripe("Too many rows for table %s", name); }
if (res > 0) {
empfile[type].fids = row + 1; empfile[type].fids = row + 1;
if (!fixed_rows) if (!fixed_rows)
xuinitrow(type, row); xuinitrow(type, row);
if (xuloadrow(type, row, values) < 0) res = xuloadrow(type, row, values);
return -1;
} }
freeflds(values);
if (res < 0)
return -1;
} }
if (fscanf(fp, "/%d%c", &rows, &sep) != 2) if (fscanf(fp, "/%d%c", &rows, &sep) != 2)