diff options
| -rw-r--r-- | runtime/dnscache.c | 23 | ||||
| -rw-r--r-- | runtime/nsd_ptcp.c | 3 |
2 files changed, 14 insertions, 12 deletions
diff --git a/runtime/dnscache.c b/runtime/dnscache.c index 7e9ebf5b..ef168f23 100644 --- a/runtime/dnscache.c +++ b/runtime/dnscache.c @@ -69,7 +69,7 @@ DEFobjCurrIf(glbl) DEFobjCurrIf(errmsg) DEFobjCurrIf(prop) static dnscache_t dnsCache; -static prop_t *staticErrIPValue; +static prop_t *staticErrValue; /* Our hash function. @@ -128,9 +128,9 @@ dnscacheInit(void) CHKiRet(objUse(errmsg, CORE_COMPONENT)); CHKiRet(objUse(prop, CORE_COMPONENT)); - prop.Construct(&staticErrIPValue); - prop.SetString(staticErrIPValue, (uchar*)"???", 3); - prop.ConstructFinalize(staticErrIPValue); + prop.Construct(&staticErrValue); + prop.SetString(staticErrValue, (uchar*)"???", 3); + prop.ConstructFinalize(staticErrValue); finalize_it: RETiRet; } @@ -140,7 +140,7 @@ rsRetVal dnscacheDeinit(void) { DEFiRet; - prop.Destruct(&staticErrIPValue); + prop.Destruct(&staticErrValue); hashtable_destroy(dnsCache.ht, 1); /* 1 => free all values automatically */ pthread_rwlock_destroy(&dnsCache.rwlock); objRelease(glbl, CORE_COMPONENT); @@ -355,6 +355,7 @@ dnscacheLookup(struct sockaddr_storage *addr, prop_t **fqdn, prop_t **fqdnLowerC } else { CHKiRet(validateEntry(etry, addr)); } + prop.AddRef(etry->ip); *ip = etry->ip; if(fqdn != NULL) { prop.AddRef(etry->fqdn); @@ -369,15 +370,15 @@ finalize_it: pthread_rwlock_unlock(&dnsCache.rwlock); if(iRet != RS_RET_OK && iRet != RS_RET_ADDRESS_UNKNOWN) { DBGPRINTF("dnscacheLookup failed with iRet %d\n", iRet); - prop.AddRef(staticErrIPValue); - *ip = staticErrIPValue; + prop.AddRef(staticErrValue); + *ip = staticErrValue; if(fqdn != NULL) { - prop.AddRef(staticErrIPValue); - *fqdn = staticErrIPValue; + prop.AddRef(staticErrValue); + *fqdn = staticErrValue; } if(fqdnLowerCase != NULL) { - prop.AddRef(staticErrIPValue); - *fqdnLowerCase = staticErrIPValue; + prop.AddRef(staticErrValue); + *fqdnLowerCase = staticErrValue; } } RETiRet; diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c index c05397a6..ebfed722 100644 --- a/runtime/nsd_ptcp.c +++ b/runtime/nsd_ptcp.c @@ -264,9 +264,10 @@ FillRemHost(nsd_ptcp_t *pThis, struct sockaddr_storage *pAddr) * (side note: we may hold on to these values for quite a while, thus we trim their * memory consumption) */ - if((pThis->pRemHostName = MALLOC(prop.GetStringLen(fqdn+1))) == NULL) + if((pThis->pRemHostName = MALLOC(prop.GetStringLen(fqdn)+1)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); memcpy(pThis->pRemHostName, propGetSzStr(fqdn), prop.GetStringLen(fqdn)+1); + prop.Destruct(&fqdn); finalize_it: RETiRet; |