forked from pool/systemd
d76216e1f9
(please also push to 13.1, I want the same version as F20) - Add 0001-gpt-auto-generator-exit-immediately-if-in-container.patch: don't start gpt auto-generator in container (git). - Add 0001-manager-when-verifying-whether-clients-may-change-en.patch: fix reload check in selinux case (git). - Add 0001-logind-fix-bus-introspection-data-for-TakeControl.patch: fix introspection for TakeControl (git). - Add 0001-mount-check-for-NULL-before-reading-pm-what.patch: fix crash when parsing some incorrect unit (git). - Add 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch: Fix udev rules parsing (git). - Add 0001-systemd-serialize-deserialize-forbid_restart-value.patch: Fix incorrect deserialization for forbid_restart (git). - Add 0001-core-unify-the-way-we-denote-serialization-attribute.patch: Ensure forbid_restart is named like other attributes (git). - Add 0001-journald-fix-minor-memory-leak.patch: fix memleak in journald (git). - Add 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch: Improve ACPI firmware performance parsing (git). - Add 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch: Fix journal rotation (git). - Add 0001-login-fix-invalid-free-in-sd_session_get_vt.patch: Fix memory corruption in sd_session_get_vt (git). OBS-URL: https://build.opensuse.org/request/show/203387 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=454
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001
|
|
From: Dave Reisner <dreisner@archlinux.org>
|
|
Date: Sun, 6 Oct 2013 18:26:23 -0400
|
|
Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node
|
|
|
|
Triggered false negatives when encoding a string which needed every
|
|
character to be escaped, e.g. "LABEL=/".
|
|
---
|
|
src/shared/util.c | 2 +-
|
|
src/test/test-device-nodes.c | 4 +++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
index 82f4221..31cea79 100644
|
|
--- a/src/shared/util.c
|
|
+++ b/src/shared/util.c
|
|
@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) {
|
|
if (u == NULL)
|
|
return NULL;
|
|
|
|
- enc_len = strlen(u) * 4;
|
|
+ enc_len = strlen(u) * 4 + 1;
|
|
t = new(char, enc_len);
|
|
if (t == NULL)
|
|
return NULL;
|
|
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
|
|
index 2f3dedb..59ba4be 100644
|
|
--- a/src/test/test-device-nodes.c
|
|
+++ b/src/test/test-device-nodes.c
|
|
@@ -26,7 +26,7 @@
|
|
|
|
/* helpers for test_encode_devnode_name */
|
|
static char *do_encode_string(const char *in) {
|
|
- size_t out_len = strlen(in) * 4;
|
|
+ size_t out_len = strlen(in) * 4 + 1;
|
|
char *out = malloc(out_len);
|
|
|
|
assert_se(out);
|
|
@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) {
|
|
assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
|
|
assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
|
|
assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
|
|
+ assert_se(expect_encoded_as("/", "\\x2f"));
|
|
+ assert_se(expect_encoded_as("!", "\\x21"));
|
|
}
|
|
|
|
int main(int argc, char *argv[]) {
|
|
--
|
|
1.8.4
|
|
|