- (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from

   failing with NOMEMORY if no sigs are returned and malloc(0) returns NULL.
   From Martin.Kraemer at Fujitsu-Siemens.com; ok djm@

diff --git a/ChangeLog b/ChangeLog
index cdffa9b8625051aee53b451077cefeaf34ad49ae..c4b2ace8b59b5d0e70a33f7f03bb2adcf73fa24f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20040829
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from
+   failing with NOMEMORY if no sigs are returned and malloc(0) returns NULL.
+   From Martin.Kraemer at Fujitsu-Siemens.com; ok djm@
+
 20040828
  - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
    vinschen at redhat.com.

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 660427c1f0f67d716c6b93203882c79438ef0107..4e869c4dfd853ddfc68499e5631d09ae7fc04c4f 100644 (file)
--- 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;
        }