wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from lategoodbye/master

Browse Source 
fix some handling after memory allocation
This commit is contained in:
Robert Johansson 2013-04-13 03:41:22 -07:00
commit 36223255b8
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mbus/mbus-protocol-aux.c
View File

@ -1147,6 +1147,13 @@ mbus_parse_fixed_record(char status_byte, char medium_unit, u_char *data)
/* shared/static memory - get own copy */ /* shared/static memory - get own copy */
record->function_medium = strdup(mbus_data_fixed_function((int)status_byte)); /* stored / actual */ record->function_medium = strdup(mbus_data_fixed_function((int)status_byte)); /* stored / actual */
if (record->function_medium == NULL)
{
MBUS_ERROR("%s: memory allocation error\n", __PRETTY_FUNCTION__);
mbus_record_free(record);
return NULL;
}
long value = 0; long value = 0;
if ((status_byte & MBUS_DATA_FIXED_STATUS_FORMAT_MASK) == MBUS_DATA_FIXED_STATUS_FORMAT_BCD) if ((status_byte & MBUS_DATA_FIXED_STATUS_FORMAT_MASK) == MBUS_DATA_FIXED_STATUS_FORMAT_BCD)
{ {
@ -1203,6 +1210,13 @@ mbus_parse_variable_record(mbus_data_record *data)
record->function_medium = strdup("Manufacturer specific"); record->function_medium = strdup("Manufacturer specific");
} }
if (record->function_medium == NULL)
{
MBUS_ERROR("%s: memory allocation error\n", __PRETTY_FUNCTION__);
mbus_record_free(record);
return NULL;
}
/* parsing of data not implemented yet /* parsing of data not implemented yet
manufacturer specific data structures to end of user data */ manufacturer specific data structures to end of user data */
@ -1228,6 +1242,14 @@ mbus_parse_variable_record(mbus_data_record *data)
else else
{ {
record->function_medium = strdup(mbus_data_record_function(data)); record->function_medium = strdup(mbus_data_record_function(data));
if (record->function_medium == NULL)
{
MBUS_ERROR("%s: memory allocation error\n", __PRETTY_FUNCTION__);
mbus_record_free(record);
return NULL;
}
MBUS_DEBUG("record->function_medium = %s \n", record->function_medium); MBUS_DEBUG("record->function_medium = %s \n", record->function_medium);
if (mbus_variable_value_decode(data, &value_out_real, &value_out_str, &value_out_str_size) != 0) if (mbus_variable_value_decode(data, &value_out_real, &value_out_str, &value_out_str_size) != 0)

4
mbus/mbus-protocol.c
View File

@ -3827,6 +3827,10 @@ mbus_frame_data_new()
{ {
return NULL; return NULL;
} }
memset(data, 0, sizeof(mbus_frame_data));
data->data_var.data = NULL;
data->data_var.record = NULL; data->data_var.record = NULL;
return data; return data;