Merge pull request #1061 from pi-hole/fix/retired_dnssec_has_no_upstream

Fix incorrect "FATAL: Trying to access upstream ID -1" warning in the logs

src/database/query-table.c

@@ -533,11 +533,16 @@ void DB_read_queries(void)
  case QUERY_RETRIED: // (fall through)
  case QUERY_RETRIED_DNSSEC: // (fall through)
  counters->forwarded++;
- upstreamsData *upstream = getUpstream(upstreamID, true);
- if(upstream != NULL)
+ // Only update upstream if there is one (there
+ // won't be one for retried DNSSEC queries)
+ if(upstreamID > -1)
  {
- upstream->count++;
- upstream->lastQuery = queryTimeStamp;
+ upstreamsData *upstream = getUpstream(upstreamID, true);
+ if(upstream != NULL)
+ {
+ upstream->count++;
+ upstream->lastQuery = queryTimeStamp;
+ }
  }
  // Update overTime data structure
  overTime[timeidx].forwarded++;

src/dnsmasq_interface.c

@@ -1929,7 +1929,7 @@ void FTL_forwarding_retried(const struct server *serv, const int oldID, const in
  {
  if(dnssec)
  {
- // There is point in retrying the query when
+ // There is no point in retrying the query when
  // we've already got an answer to this query,
  // but we're awaiting keys for DNSSEC
  // validation. We're retrying the DNSSEC query

src/shmem.c

@@ -1036,6 +1036,10 @@ domainsData* _getDomain(int domainID, bool checkMagic, int line, const char * fu
 
 upstreamsData* _getUpstream(int upstreamID, bool checkMagic, int line, const char * function, const char * file)
 {
+ // This does not exist, we return a NULL pointer
+ if(upstreamID == -1)
+ return NULL;
+
  if(check_range(upstreamID, counters->upstreams_MAX, "upstream", line, function, file) &&
  check_magic(upstreamID, checkMagic, upstreams[upstreamID].magic, "upstream", line, function, file))
  return &upstreams[upstreamID];