summaryrefslogtreecommitdiff
blob: 7a4d2da7187fa6a09576641365bb846d965fd5d1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
This upstream patch has been merged but not released. I (mjo) dropped
a change to the NEWS file to prevent a pointless conflict.

From a1295eefc78b6e8a3c220e164dbfad6dbecc6f6e Mon Sep 17 00:00:00 2001
From: Antonio Mammita <am@spamteq.com>
Date: Wed, 21 Dec 2016 16:54:06 +0100
Subject: [PATCH] Fix for out of memory errors on huge zones. Thanks to Andrew
 Clayton

---
 rbldnsd.h      | 6 +++---
 rbldnsd_util.c | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rbldnsd.h b/rbldnsd.h
index 6acd8a0..f195a30 100644
--- a/rbldnsd.h
+++ b/rbldnsd.h
@@ -367,9 +367,9 @@ extern struct dataset *g_dsacl;	/* global acl */
 extern const char *show_version; /* version.bind CH TXT */
 
 void oom(void);
-char *emalloc(unsigned size);
-char *ezalloc(unsigned size); /* zero-fill */
-char *erealloc(void *ptr, unsigned size);
+char *emalloc(size_t size);
+char *ezalloc(size_t size); /* zero-fill */
+char *erealloc(void *ptr, size_t size);
 char *estrdup(const char *str);
 char *ememdup(const void *buf, unsigned size);
 
diff --git a/rbldnsd_util.c b/rbldnsd_util.c
index d17b51b..c6d628d 100644
--- a/rbldnsd_util.c
+++ b/rbldnsd_util.c
@@ -460,21 +460,21 @@ dump_a_txt(const char *name, const char *rr,
 
 #endif
 
-char *emalloc(unsigned size) {
+char *emalloc(size_t size) {
   void *ptr = malloc(size);
   if (!ptr)
     oom();
   return ptr;
 }
 
-char *ezalloc(unsigned size) {
+char *ezalloc(size_t size) {
   void *ptr = calloc(1, size);
   if (!ptr)
     oom();
   return ptr;
 }
 
-char *erealloc(void *ptr, unsigned size) {
+char *erealloc(void *ptr, size_t size) {
   void *nptr = realloc(ptr, size);
   if (!nptr)
     oom();