shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 16:59:03 +03:00
Code

timedate: use free_and_strdup()

Browse Source
This commit is contained in:
Yu Watanabe 2018-05-10 00:59:47 +09:00
parent 130d3d22e9
commit 2c3def6214
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/timedate/timedated.c
View File

@ -532,10 +532,8 @@ static int property_get_ntp(
static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *error) { static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *error) {
Context *c = userdata; Context *c = userdata;
int interactive, r;
const char *z; const char *z;
int interactive;
char *t;
int r;
assert(m); assert(m);
assert(c); assert(c);
@ -547,7 +545,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
if (!timezone_is_valid(z)) if (!timezone_is_valid(z))
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid time zone '%s'", z); return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid time zone '%s'", z);
if (streq_ptr(z, c->zone)) r = free_and_strdup(&c->zone, z);
if (r < 0)
return r;
if (r == 0)
return sd_bus_reply_method_return(m, NULL); return sd_bus_reply_method_return(m, NULL);
r = bus_verify_polkit_async( r = bus_verify_polkit_async(
@ -564,13 +565,6 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
if (r == 0) if (r == 0)
return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
t = strdup(z);
if (!t)
return -ENOMEM;
free(c->zone);
c->zone = t;
/* 1. Write new configuration file */ /* 1. Write new configuration file */
r = context_write_data_timezone(c); r = context_write_data_timezone(c);
if (r < 0) { if (r < 0) {