dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-device: the last argument of sd_device_get_sysattr_value() may be NULL

Browse Source
This commit is contained in:
Yu Watanabe
2021-02-18 23:40:33 +09:00
parent 2a394d0bf2
commit 32a739afe0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsystemd/sd-device/sd-device.c
View File

@@ -1862,7 +1862,7 @@ static int device_get_cached_sysattr_value(sd_device *device, const char *_key,
/* We cache all sysattr lookups. If an attribute does not exist, it is stored
* with a NULL value in the cache, otherwise the returned string is stored */
_public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **_value) {
_public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **ret_value) {
_cleanup_free_ char *value = NULL;
const char *path, *syspath, *cached_value = NULL;
struct stat statbuf;
@@ -1881,8 +1881,8 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr,
/* we looked up the sysattr before and it did not exist */
return -ENOENT;
if (_value)
*_value = cached_value;
if (ret_value)
*ret_value = cached_value;
return 0;
}
@@ -1929,7 +1929,8 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr,
if (r < 0)
return r;
*_value = TAKE_PTR(value);
if (ret_value)
*ret_value = TAKE_PTR(value);
return 0;
}