forked from pool/systemd
e7c96ab7f3
- Add patch 0001-bnc888612-logind-polkit-acpi.patch from Frederic to solve bnc#888612 - AUDIT-0: Power button press at gdm login should not prompt for credentials - Add upstream bugfix patches 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch 0003-mount-order-options-before-other-arguments-to-mount.patch 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch 0005-shared-label.h-add-missing-stdio.h-include.patch 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch 1081-udevd-check-return-of-various-functions.patch 1082-udevadm-hwdb-check-return-value-of-fseeko.patch 1083-udev-node-warn-if-chmod-chown-fails.patch 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch 1085-udev-fix-typos.patch 1086-udevd-don-t-fail-if-run-udev-exists.patch - Add upstream bugfix patches 0001-core-fix-resource-leak-in-manager_environment_add.patch 0002-util-remove-a-unnecessary-check.patch 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch 0004-shared-conf-parser.patch 0005-logind-fix-typo.patch 0006-systemctl-fix-resource-leak-CID-1237747.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patc OBS-URL: https://build.opensuse.org/request/show/250254 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=207
53 lines
3.4 KiB
Diff
53 lines
3.4 KiB
Diff
Based on 77c10205bb337585c320e91af4b416f2dcc6faba Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Thu, 18 Sep 2014 13:47:00 +0200
|
|
Subject: [PATCH] shared: conf-parser - don't leak memory on error in
|
|
DEFINE_CONFIG_PARSE_ENUMV
|
|
|
|
Found by Coverity. Fixes CID #1237746.
|
|
---
|
|
src/shared/conf-parser.h | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
--- src/shared/conf-parser.h
|
|
+++ src/shared/conf-parser.h 2014-09-18 13:14:43.730234764 +0000
|
|
@@ -171,7 +171,8 @@ int log_syntax_internal(const char *unit
|
|
void *data, \
|
|
void *userdata) { \
|
|
\
|
|
- type **enums = data, *xs, x, *ys; \
|
|
+ type **enums = data, x, *ys; \
|
|
+ _cleanup_free_ type *xs = NULL; \
|
|
char *w, *state; \
|
|
size_t l, i = 0; \
|
|
\
|
|
@@ -187,6 +188,7 @@ int log_syntax_internal(const char *unit
|
|
\
|
|
FOREACH_WORD(w, l, rvalue, state) { \
|
|
_cleanup_free_ char *en = NULL; \
|
|
+ type *new_xs; \
|
|
\
|
|
en = strndup(w, l); \
|
|
if (!en) \
|
|
@@ -212,8 +214,10 @@ int log_syntax_internal(const char *unit
|
|
continue; \
|
|
\
|
|
*(xs + i) = x; \
|
|
- xs = realloc(xs, (++i + 1) * sizeof(type)); \
|
|
- if (!xs) \
|
|
+ new_xs = realloc(xs, (++i + 1) * sizeof(type)); \
|
|
+ if (new_xs) \
|
|
+ xs = new_xs; \
|
|
+ else \
|
|
return -ENOMEM; \
|
|
\
|
|
*(xs + i) = invalid; \
|
|
@@ -221,5 +225,7 @@ int log_syntax_internal(const char *unit
|
|
\
|
|
free(*enums); \
|
|
*enums = xs; \
|
|
+ xs = NULL; \
|
|
+ \
|
|
return 0; \
|
|
}
|