diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-11-27 16:08:46 +0100 |
---|---|---|
committer | David Herrmann <dh.herrmann@gmail.com> | 2014-11-27 16:10:44 +0100 |
commit | 0f84a72e3c0f58d71cff2121e6df1611eaf9c9ea (patch) | |
tree | defc60dc5073ffe1c27cb2c33f6a73d2c3420619 /src/shared/strv.c | |
parent | 342f3005f57fe293d3b43148f8c900f2cbc6f7f7 (diff) |
resolve: fix NULL deref on strv comparison
A strv might be NULL if it is empty. The txt.strings comparison doesn't
take that into account. Introduce strv_equal() to provide a proper helper
for this and fix resolve to use it.
Thanks to Stanisław Pitucha <viraptor@gmail.com> for reporting this!
Diffstat (limited to 'src/shared/strv.c')
-rw-r--r-- | src/shared/strv.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/shared/strv.c b/src/shared/strv.c index aeb93eac6b..a5f8a2aff6 100644 --- a/src/shared/strv.c +++ b/src/shared/strv.c @@ -587,6 +587,17 @@ char **strv_sort(char **l) { return l; } +bool strv_equal(char **a, char **b) { + if (!a || !b) + return a == b; + + for ( ; *a || *b; ++a, ++b) + if (!streq_ptr(*a, *b)) + return false; + + return true; +} + void strv_print(char **l) { char **s; |