From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Mar 2018 11:48:18 +0000 (-0400)
Subject: Add a paranoia check in string_is_valid_nonrfc_hostname()
X-Git-Tag: tor-0.3.3.4-alpha~5^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4bf1f6c8eb08c39def69c839515afe475bf0a6b;p=thirdparty%2Ftor.git

Add a paranoia check in string_is_valid_nonrfc_hostname()

The earlier checks in this function should ensure that components is
always nonempty.  But in case somebody messes with them in the
future, let's add an extra check to make sure we aren't crashing.
---

diff --git a/src/common/util.c b/src/common/util.c
index 90aaf0ebeb..a68fd30d09 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1125,6 +1125,9 @@ string_is_valid_nonrfc_hostname(const char *string)
 
   smartlist_split_string(components,string,".",0,0);
 
+  if (BUG(smartlist_len(components) == 0))
+    return 0; // LCOV_EXCL_LINE should be impossible given the earlier checks.
+
   /* Allow a single terminating '.' used rarely to indicate domains
    * are FQDNs rather than relative. */
   last_label = (char *)smartlist_get(components,