From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 18 Feb 2016 22:33:10 +0000 (-0500)
Subject: basic/strbuf: do not call bsearch with a null argument
X-Git-Tag: v230~342^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82501b3fc40dae2660a86ab07462f33fe26347ad;p=thirdparty%2Fsystemd.git

basic/strbuf: do not call bsearch with a null argument

Das ist verboten!

src/basic/strbuf.c:162:23: runtime error: null pointer passed as argument 2,
                           which is declared to never be null
---

diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
index 77220c02514..dac28816039 100644
--- a/src/basic/strbuf.c
+++ b/src/basic/strbuf.c
@@ -156,6 +156,10 @@ ssize_t strbuf_add_string(struct strbuf *str, const char *s, size_t len) {
                         return off;
                 }
 
+                /* bsearch is not allowed on a NULL sequence */
+                if (node->children_count == 0)
+                        break;
+
                 /* lookup child node */
                 c = s[len - 1 - depth];
                 search.c = c;