Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | Fix the memory leak problem when HAVE_ENVIRON is defined |
| 2 | |
| 3 | Upstream-Status: Pending |
| 4 | |
| 5 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> |
| 6 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 7 | Index: syslog-ng-3.8.1/lib/gprocess.c |
| 8 | =================================================================== |
| 9 | --- syslog-ng-3.8.1.orig/lib/gprocess.c |
| 10 | +++ syslog-ng-3.8.1/lib/gprocess.c |
| 11 | @@ -1432,6 +1432,18 @@ g_process_startup_ok(void) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 12 | void |
| 13 | g_process_finish(void) |
| 14 | { |
| 15 | +#ifdef HAVE_ENVIRON |
| 16 | + int i = 0; |
| 17 | + |
| 18 | + while (environ[i]) { |
| 19 | + g_free(environ[i]); |
| 20 | + ++i; |
| 21 | + } |
| 22 | + if (environ) |
| 23 | + g_free(environ); |
| 24 | + if (process_opts.argv_orig) |
| 25 | + free(process_opts.argv_orig); |
| 26 | +#endif |
| 27 | g_process_remove_pidfile(); |
| 28 | } |
| 29 | |