|
 |
9fc0f6 |
From 2f7ce3bd875000149a0868b0652d40406c534f8b Mon Sep 17 00:00:00 2001
|
|
|
9fc0f6 |
From: Dave Reisner <dreisner@archlinux.org>
|
|
|
9fc0f6 |
Date: Sun, 6 Oct 2013 18:26:23 -0400
|
|
|
9fc0f6 |
Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
Triggered false negatives when encoding a string which needed every
|
|
|
9fc0f6 |
character to be escaped, e.g. "LABEL=/".
|
|
|
9fc0f6 |
---
|
|
|
9fc0f6 |
src/shared/util.c | 2 +-
|
|
|
9fc0f6 |
src/test/test-device-nodes.c | 4 +++-
|
|
|
9fc0f6 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
|
9fc0f6 |
index 48adc83..6c88040 100644
|
|
|
9fc0f6 |
--- a/src/shared/util.c
|
|
|
9fc0f6 |
+++ b/src/shared/util.c
|
|
|
9fc0f6 |
@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) {
|
|
|
9fc0f6 |
if (u == NULL)
|
|
|
9fc0f6 |
return NULL;
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
- enc_len = strlen(u) * 4;
|
|
|
9fc0f6 |
+ enc_len = strlen(u) * 4 + 1;
|
|
|
9fc0f6 |
t = new(char, enc_len);
|
|
|
9fc0f6 |
if (t == NULL)
|
|
|
9fc0f6 |
return NULL;
|
|
|
9fc0f6 |
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
|
|
|
9fc0f6 |
index 2f3dedb..59ba4be 100644
|
|
|
9fc0f6 |
--- a/src/test/test-device-nodes.c
|
|
|
9fc0f6 |
+++ b/src/test/test-device-nodes.c
|
|
|
9fc0f6 |
@@ -26,7 +26,7 @@
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
/* helpers for test_encode_devnode_name */
|
|
|
9fc0f6 |
static char *do_encode_string(const char *in) {
|
|
|
9fc0f6 |
- size_t out_len = strlen(in) * 4;
|
|
|
9fc0f6 |
+ size_t out_len = strlen(in) * 4 + 1;
|
|
|
9fc0f6 |
char *out = malloc(out_len);
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
assert_se(out);
|
|
|
9fc0f6 |
@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) {
|
|
|
9fc0f6 |
assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
|
|
|
9fc0f6 |
assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
|
|
|
9fc0f6 |
assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
|
|
|
9fc0f6 |
+ assert_se(expect_encoded_as("/", "\\x2f"));
|
|
|
9fc0f6 |
+ assert_se(expect_encoded_as("!", "\\x21"));
|
|
|
9fc0f6 |
}
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
int main(int argc, char *argv[]) {
|