system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 08:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-device: ensure update_properties_buf() is a noop on failure

Browse source 
Don't clobber the sd_device struct, and don't leak memory when memory allocation fails.
This commit is contained in:
Tom Gundersen 2015-06-01 16:28:58 +02:00
parent c521a430fd
commit ccc1002a1c
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libsystemd/sd-device/device-private.c
View file

@ -636,9 +636,10 @@ int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len) {
static int device_update_properties_bufs(sd_device *device) { static int device_update_properties_bufs(sd_device *device) {
const char *val, *prop; const char *val, *prop;
uint8_t *buf_nulstr = NULL; _cleanup_free_ char **buf_strv = NULL;
_cleanup_free_ uint8_t *buf_nulstr = NULL;
size_t allocated_nulstr = 0; size_t allocated_nulstr = 0;
size_t nulstr_len = 0, num = 0, i; size_t nulstr_len = 0, num = 0, i = 0;
assert(device); assert(device);
@ -659,20 +660,25 @@ static int device_update_properties_bufs(sd_device *device) {
++num; ++num;
} }
free(device->properties_nulstr); /* build buf_strv from buf_nulstr */
device->properties_nulstr = buf_nulstr; buf_strv = new0(char *, num + 1);
device->properties_nulstr_len = nulstr_len; if (!buf_strv)
return -ENOMEM;
/* build strv from buf_nulstr */
free(device->properties_strv);
device->properties_strv = new0(char *, num + 1);
i = 0;
NULSTR_FOREACH(val, (char*) buf_nulstr) { NULSTR_FOREACH(val, (char*) buf_nulstr) {
device->properties_strv[i] = (char *) val; buf_strv[i] = (char *) val;
assert(i < num); assert(i < num);
i++; i++;
} }
free(device->properties_nulstr);
device->properties_nulstr = buf_nulstr;
buf_nulstr = NULL;
device->properties_nulstr_len = nulstr_len;
free(device->properties_strv);
device->properties_strv = buf_strv;
buf_strv = NULL;
device->properties_buf_outdated = false; device->properties_buf_outdated = false;
return 0; return 0;