Merge 4.0p1 to the trunk.

1 files changed, 1 insertions, 1 deletions

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 660427c1f..4e869c4df 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -277,7 +277,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
 
         /* allocate memory for signatures */
         rrset->rri_sigs = calloc(rrset->rri_nsigs, sizeof(struct rdatainfo));
-        if (rrset->rri_sigs == NULL) {
+        if (rrset->rri_nsigs > 0 && rrset->rri_sigs == NULL) {
                 result = ERRSET_NOMEMORY;
                 goto fail;
         }