qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-30 20:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a bunch of potential malloc (0) calls

Browse source
This commit is contained in:
Bill Currie 2002-08-25 23:16:07 +00:00
parent cfedb80d1d
commit aaab480676
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tools/qfcc/source/obj_file.c
View file

@ -97,9 +97,12 @@ allocate_stuff (void)
} }
} }
num_relocs += count_relocs (pr.relocs); num_relocs += count_relocs (pr.relocs);
defs = calloc (num_defs, sizeof (qfo_def_t)); if (num_defs)
funcs = calloc (num_funcs, sizeof (qfo_func_t)); defs = calloc (num_defs, sizeof (qfo_def_t));
relocs = calloc (num_relocs, sizeof (qfo_reloc_t)); if (num_funcs)
funcs = calloc (num_funcs, sizeof (qfo_func_t));
if (num_relocs)
relocs = calloc (num_relocs, sizeof (qfo_reloc_t));
} }
static string_t static string_t
@ -364,29 +367,43 @@ qfo_read (VFile *file)
return 0; return 0;
} }
qfo->code = malloc (qfo->code_size * sizeof (dstatement_t)); if (qfo->code_size)
qfo->data = malloc (qfo->data_size * sizeof (pr_type_t)); qfo->code = malloc (qfo->code_size * sizeof (dstatement_t));
if (qfo->data_size)
qfo->data = malloc (qfo->data_size * sizeof (pr_type_t));
if (qfo->far_data_size) if (qfo->far_data_size)
qfo->far_data = malloc (qfo->far_data_size * sizeof (pr_type_t)); qfo->far_data = malloc (qfo->far_data_size * sizeof (pr_type_t));
qfo->strings = malloc (qfo->strings_size); if (qfo->strings_size)
qfo->relocs = malloc (qfo->num_relocs * sizeof (qfo_reloc_t)); qfo->strings = malloc (qfo->strings_size);
qfo->defs = malloc (qfo->num_defs * sizeof (qfo_def_t)); if (qfo->num_relocs)
qfo->funcs = malloc (qfo->num_funcs * sizeof (qfo_func_t)); qfo->relocs = malloc (qfo->num_relocs * sizeof (qfo_reloc_t));
if (qfo->num_defs)
qfo->defs = malloc (qfo->num_defs * sizeof (qfo_def_t));
if (qfo->num_funcs)
qfo->funcs = malloc (qfo->num_funcs * sizeof (qfo_func_t));
if (qfo->num_lines) if (qfo->num_lines)
qfo->lines = malloc (qfo->num_lines * sizeof (pr_lineno_t)); qfo->lines = malloc (qfo->num_lines * sizeof (pr_lineno_t));
qfo->types = malloc (qfo->types_size); if (qfo->types_size)
qfo->types = malloc (qfo->types_size);
Qread (file, qfo->code, qfo->code_size * sizeof (dstatement_t)); if (qfo->code_size)
Qread (file, qfo->data, qfo->data_size * sizeof (pr_type_t)); Qread (file, qfo->code, qfo->code_size * sizeof (dstatement_t));
if (qfo->data_size)
Qread (file, qfo->data, qfo->data_size * sizeof (pr_type_t));
if (qfo->far_data_size) if (qfo->far_data_size)
Qread (file, qfo->far_data, qfo->far_data_size * sizeof (pr_type_t)); Qread (file, qfo->far_data, qfo->far_data_size * sizeof (pr_type_t));
Qread (file, qfo->strings, qfo->strings_size); if (qfo->strings_size)
Qread (file, qfo->relocs, qfo->num_relocs * sizeof (qfo_reloc_t)); Qread (file, qfo->strings, qfo->strings_size);
Qread (file, qfo->defs, qfo->num_defs * sizeof (qfo_def_t)); if (qfo->num_relocs)
Qread (file, qfo->funcs, qfo->num_funcs * sizeof (qfo_func_t)); Qread (file, qfo->relocs, qfo->num_relocs * sizeof (qfo_reloc_t));
if (qfo->num_defs)
Qread (file, qfo->defs, qfo->num_defs * sizeof (qfo_def_t));
if (qfo->num_funcs)
Qread (file, qfo->funcs, qfo->num_funcs * sizeof (qfo_func_t));
if (qfo->num_lines) if (qfo->num_lines)
Qread (file, qfo->lines, qfo->num_lines * sizeof (pr_lineno_t)); Qread (file, qfo->lines, qfo->num_lines * sizeof (pr_lineno_t));
Qread (file, qfo->types, qfo->types_size); if (qfo->types_size)
Qread (file, qfo->types, qfo->types_size);
for (st = qfo->code; st - qfo->code < qfo->code_size; st++) { for (st = qfo->code; st - qfo->code < qfo->code_size; st++) {
st->op = LittleLong (st->op); st->op = LittleLong (st->op);