4208. [bug] Address null pointer dereferences on out of memory.

                        [RT #40764]

diff --git a/CHANGES b/CHANGES
index 0c687d900a6f50b278706e294f8fd2b93832cfb8..b63f9a348e8de9c48bb6b84316d10574a46fbbad 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4208.  [bug]           Address null pointer dereferences on out of memory.
+                       [RT #40764]
+
 4207.  [bug]           Handle class mismatches with raw zone files.
                        [RT #40746]
 

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index e46c52e1c7f93eb6ec1affc686248b286d8df5e8..335519a13992c31f05b0b322a75135b14630bfb3 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -903,6 +903,8 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 
                len = strlen(dlzname) + 5;
                cpval = isc_mem_allocate(mctx, len);
+               if (cpval == NULL)
+                       return (ISC_R_NOMEMORY);
                snprintf(cpval, len, "dlz %s", dlzname);
        }
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index eca42b4f8b9a01f29c1cfd81294ee6640cb0f9e1..c6c7ef90e8f7d59f05e3087d0246eaccfaff7fee 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -641,6 +641,8 @@ read_sessionkey(isc_mem_t *mctx, isc_log_t *lctx) {
 
        len = strlen(algorithm) + strlen(mykeyname) + strlen(secretstr) + 3;
        keystr = isc_mem_allocate(mctx, len);
+       if (keystr == NULL)
+               fatal("out of memory");
        snprintf(keystr, len, "%s:%s:%s", algorithm, mykeyname, secretstr);
        setup_keystr();