sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-11 22:11:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fail gracefully when set_dhcp_option() is called with options==NULL.

Browse Source
This commit is contained in:
Michael Brown
2006-08-11 18:16:34 +00:00
parent db46972349
commit db0ff1731f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/dhcpopts.c
View File

@@ -409,12 +409,16 @@ struct dhcp_option * set_dhcp_option ( struct dhcp_option_block *options,
const void *data, size_t len ) { const void *data, size_t len ) {
static const uint8_t empty_encapsulator[] = { DHCP_END }; static const uint8_t empty_encapsulator[] = { DHCP_END };
struct dhcp_option *option; struct dhcp_option *option;
void *insertion_point = options->data; void *insertion_point;
struct dhcp_option *encapsulator = NULL; struct dhcp_option *encapsulator = NULL;
unsigned int encap_tag = DHCP_ENCAPSULATOR ( tag ); unsigned int encap_tag = DHCP_ENCAPSULATOR ( tag );
size_t old_len = 0; size_t old_len = 0;
size_t new_len = ( len ? ( len + DHCP_OPTION_HEADER_LEN ) : 0 ); size_t new_len = ( len ? ( len + DHCP_OPTION_HEADER_LEN ) : 0 );
/* Return NULL if no options block specified */
if ( ! options )
return NULL;
/* Find old instance of this option, if any */ /* Find old instance of this option, if any */
option = find_dhcp_option_with_encap ( options, tag, &encapsulator ); option = find_dhcp_option_with_encap ( options, tag, &encapsulator );
if ( option ) { if ( option ) {
@@ -428,6 +432,7 @@ struct dhcp_option * set_dhcp_option ( struct dhcp_option_block *options,
} }
/* Ensure that encapsulator exists, if required */ /* Ensure that encapsulator exists, if required */
insertion_point = options->data;
if ( DHCP_IS_ENCAP_OPT ( tag ) ) { if ( DHCP_IS_ENCAP_OPT ( tag ) ) {
if ( ! encapsulator ) if ( ! encapsulator )
encapsulator = set_dhcp_option ( options, encap_tag, encapsulator = set_dhcp_option ( options, encap_tag,