fly/terragear
1
0
Fork 0
Code Activity

This code does a lot of malloc()'ing of space, and in some cases blindly

Browse source 
expects the results to be zero'd out, even though this may not be gauranteed.
So I (Curt Olson, curt@flightgear.org) have added some code here
to explicitely zero out the space after it is malloc()'ed.
This commit is contained in:
curt 2000-11-20 17:01:13 +00:00
parent e189a03b47
commit 41733cf6cc
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Lib/TriangleJRS/triangle.c
View file

@ -3275,6 +3275,8 @@ struct memorypool *pool;
VOID *newitem; VOID *newitem;
VOID **newblock; VOID **newblock;
unsigned long alignptr; unsigned long alignptr;
char *ptr; /* Added CLO 11/20/2000 */
int i; /* Added CLO 11/20/2000 */
/* First check the linked list of dead items. If the list is not */ /* First check the linked list of dead items. If the list is not */
/* empty, allocate an item from the list rather than a fresh one. */ /* empty, allocate an item from the list rather than a fresh one. */
@ -3321,6 +3323,18 @@ struct memorypool *pool;
pool->maxitems++; pool->maxitems++;
} }
pool->items++; pool->items++;
/* Added CLO 11/20/2000. Explanation: this code does a lot of
malloc()'ing of space, and in some cases blindly expects the
results to be zero'd out, even though this may not be gauranteed.
So I (Curt Olson, curt@flightgear.org) have added some code here
to explicitely zero out the space after it is malloc()'ed. */
ptr = (char *)newitem;
for ( i = 0; i < pool->itembytes; ++i ) {
ptr[i] = 0;
}
/* End of CLO 11/20/2000 addition */
return newitem; return newitem;
} }
@ -9775,8 +9789,8 @@ int newmark;
triangle encodedtri; triangle encodedtri;
point checkpoint; point checkpoint;
triangle ptr; /* Temporary variable used by sym(). */ triangle ptr; /* Temporary variable used by sym(). */
if (verbose > 1) { if (verbose > 1) {
printf(" point2triindex = %d\n", point2triindex );
printf(" Connecting (%.12g, %.12g) to (%.12g, %.12g).\n", printf(" Connecting (%.12g, %.12g) to (%.12g, %.12g).\n",
endpoint1[0], endpoint1[1], endpoint2[0], endpoint2[1]); endpoint1[0], endpoint1[1], endpoint2[0], endpoint2[1]);
} }
@ -9784,6 +9798,9 @@ int newmark;
/* Find a triangle whose origin is the segment's first endpoint. */ /* Find a triangle whose origin is the segment's first endpoint. */
checkpoint = (point) NULL; checkpoint = (point) NULL;
encodedtri = point2tri(endpoint1); encodedtri = point2tri(endpoint1);
if (verbose > 1) {
printf("encodedtri = %x\n", encodedtri );
}
if (encodedtri != (triangle) NULL) { if (encodedtri != (triangle) NULL) {
decode(encodedtri, searchtri1); decode(encodedtri, searchtri1);
org(searchtri1, checkpoint); org(searchtri1, checkpoint);