22 |
|
static double getflt(); |
23 |
|
static long getint(); |
24 |
|
static char *getstr(); |
25 |
+ |
static int getobj(), octerror(); |
26 |
|
static OCTREE getfullnode(), gettree(); |
27 |
|
|
28 |
|
static char *infn; /* input file name */ |
29 |
|
static FILE *infp; /* input file stream */ |
30 |
+ |
static int objsize; /* size of stored OBJECT's */ |
31 |
|
static OBJECT objorig; /* zeroeth object */ |
32 |
|
static short otypmap[NUMOTYPE+8]; /* object type map */ |
33 |
|
|
44 |
|
int nf; |
45 |
|
OBJECT fnobjects; |
46 |
|
register int i; |
47 |
+ |
long m; |
48 |
|
|
49 |
|
if (fname == NULL) { |
50 |
|
infn = "standard input"; |
61 |
|
if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0) |
62 |
|
octerror(USER, "not an octree"); |
63 |
|
/* check format */ |
64 |
< |
if (getint(2) != OCTMAGIC) |
64 |
> |
if ((objsize = getint(2)-OCTMAGIC) <= 0 || |
65 |
> |
objsize > MAXOBJSIZ || objsize > sizeof(long)) |
66 |
|
octerror(USER, "incompatible octree format"); |
67 |
|
/* get boundaries */ |
68 |
|
if (load & IO_BOUNDS) { |
85 |
|
if (load & IO_FILES) |
86 |
|
ofn[nf] = NULL; |
87 |
|
/* get number of objects */ |
88 |
< |
fnobjects = getint(sizeof(OBJECT)); |
88 |
> |
fnobjects = m = getint(objsize); |
89 |
> |
if (fnobjects != m) |
90 |
> |
octerror(USER, "too many objects"); |
91 |
|
|
92 |
|
if (load & IO_TREE) { |
93 |
|
/* get the octree */ |
137 |
|
{ |
138 |
|
OBJECT set[MAXSET+1]; |
139 |
|
register int i; |
140 |
+ |
register long m; |
141 |
|
|
142 |
< |
set[0] = getint(sizeof(OBJECT)); |
136 |
< |
if (set[0] > MAXSET) |
142 |
> |
if ((set[0] = getint(objsize)) > MAXSET) |
143 |
|
octerror(USER, "bad set in getfullnode"); |
144 |
< |
for (i = 1; i <= set[0]; i++) |
145 |
< |
set[i] = getint(sizeof(OBJECT)) + objorig; |
144 |
> |
for (i = 1; i <= set[0]; i++) { |
145 |
> |
m = getint(objsize) + objorig; |
146 |
> |
if ((set[i] = m) != m) |
147 |
> |
octerror(USER, "too many objects"); |
148 |
> |
} |
149 |
|
return(fullnode(set)); |
150 |
|
} |
151 |
|
|
214 |
|
char sbuf[MAXSTR]; |
215 |
|
int obj; |
216 |
|
register int i; |
217 |
+ |
register long m; |
218 |
|
register OBJREC *objp; |
219 |
|
|
220 |
|
i = getint(1); |
225 |
|
objp = objptr(obj); |
226 |
|
if ((objp->otype = otypmap[i]) < 0) |
227 |
|
octerror(USER, "reference to unknown type"); |
228 |
< |
if ((objp->omod = getint(sizeof(OBJECT))) != OVOID) |
229 |
< |
objp->omod += objorig; |
228 |
> |
if ((m = getint(objsize)) != OVOID) { |
229 |
> |
m += objorig; |
230 |
> |
if ((OBJECT)m != m) |
231 |
> |
octerror(USER, "too many objects"); |
232 |
> |
} |
233 |
> |
objp->omod = m; |
234 |
|
objp->oname = savqstr(getstr(sbuf)); |
235 |
|
if (objp->oargs.nsargs = getint(2)) { |
236 |
|
objp->oargs.sarg = (char **)bmalloc |
253 |
|
objp->oargs.iarg = NULL; |
254 |
|
#endif |
255 |
|
if (objp->oargs.nfargs = getint(2)) { |
256 |
< |
objp->oargs.farg = (double *)bmalloc |
257 |
< |
(objp->oargs.nfargs*sizeof(double)); |
256 |
> |
objp->oargs.farg = (FLOAT *)bmalloc |
257 |
> |
(objp->oargs.nfargs*sizeof(FLOAT)); |
258 |
|
if (objp->oargs.farg == NULL) |
259 |
|
goto memerr; |
260 |
|
for (i = 0; i < objp->oargs.nfargs; i++) |