From 3713cd8de5c84c25b88007304e7f50edb7b97c6c Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Fri, 19 Nov 2004 18:29:20 +0000 Subject: [PATCH] don't corrupt model_data, so it can be freed properly --- ChangeLog | 1 + main/polyobj.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ee24bf3..66a6158a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2004-11-19 Chris Taylor * main/gamemine.c, main/piggy.c: compile again on older C compilers + * main/polyobj.c: don't corrupt model_data, so it can be freed properly 2004-11-16 Chris Taylor diff --git a/main/polyobj.c b/main/polyobj.c index 33c7ce71..1f938af0 100644 --- a/main/polyobj.c +++ b/main/polyobj.c @@ -1,4 +1,4 @@ -/* $Id: polyobj.c,v 1.18 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: polyobj.c,v 1.19 2004-11-19 18:29:20 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: polyobj.c,v 1.18 2004-08-28 23:17:45 schaffner Exp $"; +static char rcsid[] = "$Id: polyobj.c,v 1.19 2004-11-19 18:29:20 schaffner Exp $"; #endif #include @@ -906,7 +906,8 @@ extern void polymodel_read(polymodel *pm, CFILE *fp) pm->n_models = cfile_read_int(fp); pm->model_data_size = cfile_read_int(fp); - pm->model_data = (ubyte *) cfile_read_int(fp); + // pm->model_data = (ubyte *) // this is malloced later + cfile_read_int(fp); for (i = 0; i < MAX_SUBMODELS; i++) pm->submodel_ptrs[i] = cfile_read_int(fp); for (i = 0; i < MAX_SUBMODELS; i++) @@ -940,7 +941,8 @@ extern int polymodel_read_n(polymodel *pm, int n, CFILE *fp) for (i = 0; i < n; i++) { pm[i].n_models = cfile_read_int(fp); pm[i].model_data_size = cfile_read_int(fp); - pm[i].model_data = (ubyte *) cfile_read_int(fp); + // pm->model_data = (ubyte *) // this is malloced later + cfile_read_int(fp); for (j = 0; j < MAX_SUBMODELS; j++) pm[i].submodel_ptrs[j] = cfile_read_int(fp); for (j = 0; j < MAX_SUBMODELS; j++) -- 2.39.2