28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
|
From b30c37b500cbe0587656d5092a95fa695772cd0e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Thu, 6 Feb 2020 19:13:11 +0900
|
||
|
|
Subject: [PATCH] sysctl: fix segfault
|
||
|
|
|
||
|
|
Fixes #14801.
|
||
|
|
|
||
|
|
(cherry picked from commit db99904bc8482efe556bb010a8b203a3e60ee37f)
|
||
|
|
|
||
|
|
Resolves: #2037807
|
||
|
|
---
|
||
|
|
src/sysctl/sysctl.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
|
||
|
|
index 7b0528877c..4c85d6887f 100644
|
||
|
|
--- a/src/sysctl/sysctl.c
|
||
|
|
+++ b/src/sysctl/sysctl.c
|
||
|
|
@@ -183,7 +183,7 @@ static int parse_file(OrderedHashmap *sysctl_options, const char *path, bool ign
|
||
|
|
|
||
|
|
existing = ordered_hashmap_get(sysctl_options, p);
|
||
|
|
if (existing) {
|
||
|
|
- if (streq(value, existing->value)) {
|
||
|
|
+ if (streq_ptr(value, existing->value)) {
|
||
|
|
existing->ignore_failure = existing->ignore_failure || ignore_failure;
|
||
|
|
continue;
|
||
|
|
}
|