diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-03-11 14:47:41 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-03-11 14:47:41 (GMT) |
| commit | 8b55e393ae0d168b5ddfaa909611080ce193c390 (patch) | |
| tree | 9d0f947a96ae468e0a8a2a0f29bbedf0d3f057e6 /src | |
| parent | e04b7d991a1a252483db814eeeb4703957631730 (diff) | |
Fix bugs reserving and freeing memory when using stride lengths > 1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/tng_io.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c index 0e3d6bd..c1960ea 100644 --- a/src/lib/tng_io.c +++ b/src/lib/tng_io.c @@ -3632,8 +3632,8 @@ static tng_function_status tng_allocate_particle_data_mem n_frames = tng_max(1, n_frames); data->stride_length = tng_max(1, stride_length); data->n_values_per_frame = n_values_per_frame; - values = realloc(data->values, sizeof(union data_values **) * n_frames - / stride_length); + values = realloc(data->values, sizeof(union data_values **) * n_frames); + if(!values) { printf("Cannot allocate memory (%"PRId64" bytes). %s: %d\n", @@ -3644,7 +3644,7 @@ static tng_function_status tng_allocate_particle_data_mem } data->values = values; - for(i = n_frames / stride_length; i-- ;) + for(i = n_frames; i-- ;) { data->values[i] = malloc(sizeof(union data_values *) * n_particles); @@ -4501,14 +4501,14 @@ static tng_function_status tng_allocate_data_mem if(!values) { printf("Cannot allocate memory (%"PRId64" bytes). %s: %d\n", - sizeof(union data_values **) * n_frames / stride_length, + sizeof(union data_values *) * n_frames, __FILE__, __LINE__); free(data->values); return(TNG_CRITICAL); } data->values = values; - for(i = n_frames / stride_length; i-- ;) + for(i = n_frames; i-- ;) { data->values[i] = malloc(sizeof(union data_values) * n_values_per_frame); @@ -7010,9 +7010,7 @@ tng_function_status tng_trajectory_destroy(tng_trajectory_t *tng_data_p) frame_set->tr_particle_data[i]. values, frame_set->tr_particle_data[i]. - n_frames / - frame_set->tr_particle_data[i]. - stride_length, + n_frames, n_particles, frame_set->tr_particle_data[i]. n_values_per_frame, @@ -7035,8 +7033,7 @@ tng_function_status tng_trajectory_destroy(tng_trajectory_t *tng_data_p) { tng_data_values_free(tng_data, frame_set->tr_data[i].values, - frame_set->tr_data[i].n_frames / - frame_set->tr_data[i].stride_length, + frame_set->tr_data[i].n_frames, frame_set->tr_data[i]. n_values_per_frame, frame_set->tr_data[i].datatype); |