FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use only a single read operation

Browse Source 
The profile and throw-away data can be read all at once. This avoids the
need for an extra memory allocation and fixes a memory leak.
This commit is contained in:
Jef Driesen 2017-07-31 16:50:21 +02:00
parent cd5eb61e90
commit 88b6e36e04
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cochran_commander.c
View File

@ -970,7 +970,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
// Build dive blob
unsigned int dive_size = layout->rb_logbook_entry_size + sample_size;
unsigned char *dive = (unsigned char *) malloc(dive_size);
unsigned char *dive = (unsigned char *) malloc(dive_size + pre_size);
if (dive == NULL) {
status = DC_STATUS_NOMEMORY;
goto error;
@ -980,24 +980,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
// Read profile data
if (sample_size) {
if (pre_size) {
// Read throwaway sample data, pre-dive events and post-dive surface sample
unsigned char *pre = (unsigned char *) malloc (pre_size);
if (pre == NULL) {
status = DC_STATUS_NOMEMORY;
goto error;
}
rc = dc_rbstream_read(rbstream, &progress, pre, pre_size);
free(pre);
if (rc != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the pre-dive event data.");
status = rc;
free(dive);
goto error;
}
}
// read sample data
rc = dc_rbstream_read(rbstream, &progress, dive + layout->rb_logbook_entry_size, sample_size);
rc = dc_rbstream_read(rbstream, &progress, dive + layout->rb_logbook_entry_size, sample_size + pre_size);
if (rc != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the sample data.");
status = rc;