7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implicitly inserted capwap_outofmemory() into the capwap_alloc().

Browse Source 
capwap_alloc() can never return NULL.
This commit is contained in:
vemax78
2013-08-18 19:07:19 +02:00
parent 177e997d47
commit d34e98fc2c
87 changed files with 85 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/capwap_element_imagedata.c
View File

@ -60,14 +60,10 @@ static void* capwap_imagedata_element_parsing(capwap_message_elements_handle han
/* */
data = (struct capwap_imagedata_element*)capwap_alloc(sizeof(struct capwap_imagedata_element));
if (!data) {
capwap_outofmemory();
}
memset(data, 0, sizeof(struct capwap_imagedata_element));
/* Retrieve data */
memset(data, 0, sizeof(struct capwap_imagedata_element));
func->read_u8(handle, &data->type);
if ((data->type != CAPWAP_IMAGEDATA_TYPE_DATA_IS_INCLUDED) && (data->type != CAPWAP_IMAGEDATA_TYPE_DATA_EOF) && (data->type != CAPWAP_IMAGEDATA_TYPE_ERROR)) {
capwap_imagedata_element_free((void*)data);
capwap_logging_debug("Invalid Image Data element: underbuffer: invalid type");
@ -87,10 +83,6 @@ static void* capwap_imagedata_element_parsing(capwap_message_elements_handle han
data->data = NULL;
} else {
data->data = (uint8_t*)capwap_alloc(length);
if (!data->data) {
capwap_outofmemory();
}
func->read_block(handle, data->data, length);
}