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

[RT #40764]

(cherry picked from commit fe51e068f0)
This commit is contained in:
Mark Andrews 2015-09-17 08:51:25 +10:00
parent 1ee220eaed
commit 1b96d74ae2
3 changed files with 7 additions and 0 deletions

View file

@ -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]

View file

@ -905,6 +905,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);
}

View file

@ -640,6 +640,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();