Blame 0037-Make-sure-that-we-don-t-dereference-NULL.patch
|
 |
794d16c |
From bb653097a1e0c5c2228cafda144814c42cd05da2 Mon Sep 17 00:00:00 2001
|
|
|
794d16c |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
794d16c |
Date: Sat, 12 Oct 2013 13:43:07 -0400
|
|
|
794d16c |
Subject: [PATCH] Make sure that we don't dereference NULL
|
|
|
794d16c |
|
|
|
794d16c |
The code was actually safe, because b should
|
|
|
794d16c |
never be null, because if rvalue is empty, a different
|
|
|
794d16c |
branch is taken. But we *do* check for NULL in the
|
|
|
794d16c |
loop above, so it's better to also check here for symmetry.
|
|
|
794d16c |
---
|
|
|
794d16c |
src/core/load-fragment.c | 3 ++-
|
|
|
794d16c |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
794d16c |
|
|
|
794d16c |
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
|
|
|
794d16c |
index 44920d6..f01843d 100644
|
|
|
794d16c |
--- a/src/core/load-fragment.c
|
|
|
794d16c |
+++ b/src/core/load-fragment.c
|
|
|
794d16c |
@@ -1860,7 +1860,8 @@ int config_parse_documentation(const char *unit,
|
|
|
794d16c |
free(*a);
|
|
|
794d16c |
}
|
|
|
794d16c |
}
|
|
|
794d16c |
- *b = NULL;
|
|
|
794d16c |
+ if (b)
|
|
|
794d16c |
+ *b = NULL;
|
|
|
794d16c |
|
|
|
794d16c |
return r;
|
|
|
794d16c |
}
|
|
|
794d16c |
--
|
|
|
794d16c |
1.8.4.652.g0d6e0ce
|
|
|
794d16c |
|