[systemd-devel] [PATCH] sd-dhcp-client: prevent timer related memory leaks

[Lennart Poettering]

On Thu, 20.02.14 21:04, Umut Tezduyar Lindskog (umut.tezduyar at axis.com) wrote:

Tom commited this. Thanks!

Tom, please always do a quick reply on the ML so that it is easy to see
what is commited and what is not!

Thanks!

> ---
>  src/libsystemd-dhcp/sd-dhcp-client.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/libsystemd-dhcp/sd-dhcp-client.c b/src/libsystemd-dhcp/sd-dhcp-client.c
> index ec2b53f..53abe22 100644
> --- a/src/libsystemd-dhcp/sd-dhcp-client.c
> +++ b/src/libsystemd-dhcp/sd-dhcp-client.c
> @@ -392,6 +392,8 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
>  
>          next_timeout += (random_u32() & 0x1fffff);
>  
> +        client->timeout_resend = sd_event_source_unref(client->timeout_resend);
> +
>          r = sd_event_add_monotonic(client->event,
>                                       &client->timeout_resend,
>                                       next_timeout,
> @@ -477,6 +479,8 @@ static int client_initialize_events(sd_dhcp_client *client,
>          if (r < 0)
>                  goto error;
>  
> +        client->timeout_resend = sd_event_source_unref(client->timeout_resend);
> +
>          r = sd_event_add_monotonic(client->event,
>                                     &client->timeout_resend,
>                                     usec, 0,


Lennart

-- 
Lennart Poettering, Red Hat