From: Mark Andrews <marka@isc.org>
Date: Thu, 20 Apr 2017 00:21:00 +0000 (+1000)
Subject: 4584.   [bug]           A number of memory usage statistics were not properly
X-Git-Tag: v9.12.0a1~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddac00e3e0a84d0cdf50483b24390e96e8d3997b;p=thirdparty%2Fbind9.git

4584.   [bug]           A number of memory usage statistics were not properly
                        reported when they exceeded 4G.  [RT #44750]
---

diff --git a/CHANGES b/CHANGES
index e87f2af8878..49984877ce8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4584.	[bug]		A number of memory usage statistics were not properly
+			reported when they exceeded 4G.  [RT #44750]
+
 4583.	[func]		"host -A" returns most records for a name but
 			omits RRSIG, NSEC and NSEC3. (Thanks to Tony Finch.)
 			[RT #43032]
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 5f05be22bc3..e6e6f5d82ca 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1411,18 +1411,24 @@ dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) {
 		(isc_uint64_t) dns_db_hashsize(cache->db),
 		"cache database hash buckets");
 
-	fprintf(fp, "%20u %s\n", (unsigned int) isc_mem_total(cache->mctx),
+	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
+	        (isc_uint64_t) isc_mem_total(cache->mctx),
 		"cache tree memory total");
-	fprintf(fp, "%20u %s\n", (unsigned int) isc_mem_inuse(cache->mctx),
+	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
+		(isc_uint64_t) isc_mem_inuse(cache->mctx),
 		"cache tree memory in use");
-	fprintf(fp, "%20u %s\n", (unsigned int) isc_mem_maxinuse(cache->mctx),
+	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
+		(isc_uint64_t) isc_mem_maxinuse(cache->mctx),
 		"cache tree highest memory in use");
 
-	fprintf(fp, "%20u %s\n", (unsigned int) isc_mem_total(cache->hmctx),
+	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
+		(isc_uint64_t) isc_mem_total(cache->hmctx),
 		"cache heap memory total");
-	fprintf(fp, "%20u %s\n", (unsigned int) isc_mem_inuse(cache->hmctx),
+	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
+		(isc_uint64_t) isc_mem_inuse(cache->hmctx),
 		"cache heap memory in use");
-	fprintf(fp, "%20u %s\n", (unsigned int) isc_mem_maxinuse(cache->hmctx),
+	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
+		(isc_uint64_t) isc_mem_maxinuse(cache->hmctx),
 		"cache heap highest memory in use");
 }