sd-device: fix double-free

If an attribute is read but the value is not used (i.e. ret_value is NULL), then sd_device_get_sysattr_value() mistakenly frees the read data even though it is cached internally. Fixes a bug introduced by acfc2a1d15. Fixes #25702.
2022-12-12 14:20:47 +09:00
parent 4113a3e0f3
commit eb18e7b782
1 changed files with 7 additions and 2 deletions
@@ -2332,9 +2332,14 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr,
                                       sysattr, value, ret_value ? "" : ", ignoring");
                if (ret_value)
                        return r;
-        } else if (ret_value)
-                *ret_value = TAKE_PTR(value);

+                return 0;
+        }
+
+        if (ret_value)
+                *ret_value = value;
+
+        TAKE_PTR(value);
        return 0;
 }