daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From 3c3d3e3e040d980186fec05506018db2d24faa83 Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
923a60
Date: Mon, 11 May 2015 15:37:47 -0300
923a60
Subject: [PATCH] modules-load: fix memory leak
923a60
923a60
=================================================================
923a60
==64281==ERROR: LeakSanitizer: detected memory leaks
923a60
923a60
Direct leak of 32 byte(s) in 1 object(s) allocated from:
923a60
    #0 0x7f623c961c4a in malloc (/usr/lib64/libasan.so.2+0x96c4a)
923a60
    #1 0x5651f79ad34e in malloc_multiply (/home/crrodriguez/scm/systemd/systemd-modules-load+0x2134e)
923a60
    #2 0x5651f79b02d6 in strjoin (/home/crrodriguez/scm/systemd/systemd-modules-load+0x242d6)
923a60
    #3 0x5651f79be1f5 in files_add (/home/crrodriguez/scm/systemd/systemd-modules-load+0x321f5)
923a60
    #4 0x5651f79be6a3 in conf_files_list_strv_internal (/home/crrodriguez/scm/systemd/systemd-modules-load+0x326a3)
923a60
    #5 0x5651f79bea24 in conf_files_list_nulstr (/home/crrodriguez/scm/systemd/systemd-modules-load+0x32a24)
923a60
    #6 0x5651f79ad01a in main (/home/crrodriguez/scm/systemd/systemd-modules-load+0x2101a)
923a60
    #7 0x7f623c11586f in __libc_start_main (/lib64/libc.so.6+0x2086f)
923a60
923a60
SUMMARY: AddressSanitizer: 32 byte(s) leaked in 1 allocation(s).
923a60
923a60
This happens due to the wrong cleanup attribute is used (free vs strv_free)
923a60
923a60
Cherry-picked from: 4df3277881cffcd3bc9a5238203d6af7e1fd960f
923a60
Related: #1331667
923a60
---
923a60
 src/modules-load/modules-load.c | 2 +-
923a60
 1 file changed, 1 insertion(+), 1 deletion(-)
923a60
923a60
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
923a60
index 5f678789ce..bab9246a3e 100644
923a60
--- a/src/modules-load/modules-load.c
923a60
+++ b/src/modules-load/modules-load.c
923a60
@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) {
923a60
                 }
923a60
 
923a60
         } else {
923a60
-                _cleanup_free_ char **files = NULL;
923a60
+                _cleanup_strv_free_ char **files = NULL;
923a60
                 char **fn, **i;
923a60
 
923a60
                 STRV_FOREACH(i, arg_proc_cmdline_modules) {