forked from pool/systemd
9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
31 lines
967 B
Diff
31 lines
967 B
Diff
From 223217749e57996336d5730b0a28716cca56d45d Mon Sep 17 00:00:00 2001
|
|
From: Andreas Henriksson <andreas@fatal.se>
|
|
Date: Fri, 13 Jun 2014 18:48:18 +0200
|
|
Subject: [PATCH] install: fix invalid free() in unit_file_mask()
|
|
|
|
int unit_file_mask(...) in ./src/shared/install.c calls
|
|
get_config_path(...) which can in 4 error cases return without setting
|
|
"ret", and thus "prefix" can be uninitialized when unit_file_mask(...)
|
|
finishes (which it does directly after the error is returned from
|
|
get_config_path(...)).
|
|
---
|
|
src/shared/install.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git src/shared/install.c src/shared/install.c
|
|
index 487d0f6..f562063 100644
|
|
--- src/shared/install.c
|
|
+++ src/shared/install.c
|
|
@@ -563,7 +563,7 @@ int unit_file_mask(
|
|
unsigned *n_changes) {
|
|
|
|
char **i;
|
|
- _cleanup_free_ char *prefix;
|
|
+ _cleanup_free_ char *prefix = NULL;
|
|
int r;
|
|
|
|
assert(scope >= 0);
|
|
--
|
|
1.7.9.2
|
|
|