picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dhcp: fix creation of req_opts array

Browse source 
GREEDY_REALLOC needs to have two size variables: one for the
allocated size, and a second one for the used size. Using
the allocated size only lead to leaving some elements unitialized
and assigning some more than once.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-12-31 11:57:38 -05:00
parent aa9ed65389
commit 7a7c74cae4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libsystemd-dhcp/dhcp-client.c
View file

@ -54,6 +54,7 @@ struct sd_dhcp_client {
union sockaddr_union link;
sd_event_source *receive_message;
uint8_t *req_opts;
size_t req_opts_allocated;
size_t req_opts_size;
be32_t last_addr;
struct ether_addr mac_addr;
@ -115,11 +116,11 @@ int sd_dhcp_client_set_request_option(sd_dhcp_client *client, uint8_t option)
if (client->req_opts[i] == option)
return -EEXIST;
if (!GREEDY_REALLOC(client->req_opts, client->req_opts_size,
if (!GREEDY_REALLOC(client->req_opts, client->req_opts_allocated,
client->req_opts_size + 1))
return -ENOMEM;
client->req_opts[client->req_opts_size - 1] = option;
client->req_opts[client->req_opts_size++] = option;
return 0;
}

1
src/libsystemd-dhcp/test-dhcp-client.c
View file

@ -85,6 +85,7 @@ static void test_request_basic(sd_event *e)
assert(sd_dhcp_client_set_request_option(client, 33) == 0);
assert(sd_dhcp_client_set_request_option(client, 33) == -EEXIST);
assert(sd_dhcp_client_set_request_option(client, 44) == 0);
assert(sd_dhcp_client_set_request_option(client, 33) == -EEXIST);
}
static uint16_t client_checksum(void *buf, int len)