Tighten code validations

src/proxy-bio-plan9.c

@@ -439,7 +439,7 @@ int API BIO_proxy_set_host(BIO *b, const char *host)
   if (strlen(host) == NI_MAXHOST)
     return 1;
   ctx->host = strdup(host);
-  return 0;
+  return NULL == ctx->host;
 }
 
 void API BIO_proxy_set_port(BIO *b, uint16_t port)

src/proxy-bio.c

@@ -420,7 +420,7 @@ int API BIO_proxy_set_host (BIO *b, const char *host)
   if (strnlen (host, NI_MAXHOST) == NI_MAXHOST)
     return 1;
   ctx->host = strdup (host);
-  return 0;
+  return NULL == ctx->host;
 }
 
 void API BIO_proxy_set_port (BIO *b, uint16_t port)

src/proxy-polarssl.c

@@ -314,7 +314,7 @@ int API proxy_polarssl_set_host(proxy_polarssl_ctx *ctx, const char *host)
   if (strnlen(host, NI_MAXHOST) == NI_MAXHOST)
     return 1;
   ctx->host = strdup(host);
-  return 0;
+  return NULL == ctx->host;
 }
 
 void API proxy_polarssl_set_port(proxy_polarssl_ctx *ctx, uint16_t port)

src/test-bio.c

@@ -49,13 +49,17 @@ static size_t buf_drain (unsigned char **buf, size_t *bufsz,
     memmove (*buf, *buf + outsz, *bufsz - outsz);
   *bufsz -= outsz;
   *buf = realloc (*buf, *bufsz);
+  if (*buf == NULL)
+    fatal("out of memory for buf");
   return outsz;
 }
 
 static void buf_fill (unsigned char **buf, size_t *bufsz,
                       const unsigned char *in, size_t insz)
 {
   *buf = realloc (*buf, *bufsz + insz);
+  if (*buf == NULL)
+    fatal("out of memory for buf");
   memcpy (*buf + *bufsz, in, insz);
   *bufsz += insz;
 }

src/tlsdate-helper-plan9.c

@@ -114,13 +114,17 @@ validate_proxy_host(const char *host)
                        "abcdefghijklmnopqrstuvwxyz"
                        "0123456789"
                        ".-";
+  if (!*host)
+    die("host is empty\n");
   if (strspn(host, kValid) != strlen(host))
     die("invalid char in host\n");
 }
 
 static void
 validate_proxy_port(const char *port)
 {
+  if (!*port)
+    die("port is empty\n");
   while (*port)
     if (!isdigit(*port++))
       die("invalid char in port\n");
@@ -320,6 +324,8 @@ dns_label_count(char *label, char *delim)
   uint32_t label_count;
 
   label_tmp = strdup(label);
+  if (NULL == label_tmp)
+    fatal("out of memory for label_tmp");
   label_count = 0;
   saveptr = NULL;
   saveptr_tmp = NULL;
@@ -367,11 +373,15 @@ check_wildcard_match_rfc2595 (const char *orig_hostname,
 
   // First we copy the original strings
   hostname = strdup(orig_hostname);
+  if (NULL == hostname)
+    fatal("out of memory for hostname");
   cert_wild_card = strdup(orig_cert_wild_card);
+  if (NULL == cert_wild_card)
+    fatal("out of memory for cert_wild_card");
   hostname_to_free = hostname;
   cert_wild_card_to_free = cert_wild_card;
-  delim = strdup(".");
-  wildchar = strdup("*");
+  delim = ".";
+  wildchar = "*";
 
   verb ("V: Inspecting '%s' for possible wildcard match against '%s'\n",
          hostname, cert_wild_card);
@@ -440,8 +450,6 @@ check_wildcard_match_rfc2595 (const char *orig_hostname,
     ok = 0;
   }
   // Free our copies
-  free(wildchar);
-  free(delim);
   free(hostname_to_free);
   free(cert_wild_card_to_free);
   if (wildcard_encountered & ok && label_count >= RFC2595_MIN_LABEL_COUNT)

src/tlsdate-helper.c

@@ -115,13 +115,17 @@ validate_proxy_host(const char *host)
                        "abcdefghijklmnopqrstuvwxyz"
                        "0123456789"
                        ".-";
+  if (!*host)
+    die("host is invalid");
   if (strspn(host, kValid) != strlen(host))
     die("invalid char in host");
 }
 
 static void
 validate_proxy_port(const char *port)
 {
+  if (!*port)
+    die("port is empty");
   while (*port)
     if (!isdigit((int)(unsigned char)*port++))
       die("invalid char in port");
@@ -468,6 +472,8 @@ dns_label_count(char *label, char *delim)
   uint32_t label_count;
 
   label_tmp = strdup(label);
+  if (NULL == label_tmp)
+    fatal("out of memory for label_tmp");
   label_count = 0;
   saveptr = NULL;
   saveptr_tmp = NULL;
@@ -514,11 +520,15 @@ check_wildcard_match_rfc2595 (const char *orig_hostname,
 
   // First we copy the original strings
   hostname = strndup(orig_hostname, strlen(orig_hostname));
+  if (NULL == hostname)
+    fatal("out of memory for hostname");
   cert_wild_card = strndup(orig_cert_wild_card, strlen(orig_cert_wild_card));
+  if (NULL == cert_wild_card)
+    fatal("out of memory for cert_wild_card");
   hostname_to_free = hostname;
   cert_wild_card_to_free = cert_wild_card;
-  delim = strdup(".");
-  wildchar = strdup("*");
+  delim = ".";
+  wildchar = "*";
 
   verb_debug ("V: Inspecting '%s' for possible wildcard match against '%s'",
          hostname, cert_wild_card);
@@ -587,8 +597,6 @@ check_wildcard_match_rfc2595 (const char *orig_hostname,
     ok = 0;
   }
   // Free our copies
-  free(wildchar);
-  free(delim);
   free(hostname_to_free);
   free(cert_wild_card_to_free);
   if (wildcard_encountered & ok && label_count >= RFC2595_MIN_LABEL_COUNT)