|
 |
71c29a3 |
From 18df9e628ea10c7d607f43fcfd935e7924731f24 Mon Sep 17 00:00:00 2001
|
|
|
71c29a3 |
From: Evan Hunt <each@isc.org>
|
|
|
71c29a3 |
Date: Mon, 9 Sep 2013 22:12:47 -0700
|
|
|
71c29a3 |
Subject: [PATCH] [master] strdup journal filename
|
|
|
71c29a3 |
|
|
|
71c29a3 |
3646. [bug] Journal filename string could be set incorrectly,
|
|
|
71c29a3 |
causing garbage in log messages. [RT #34738]
|
|
|
71c29a3 |
---
|
|
|
71c29a3 |
lib/dns/journal.c | 12 +++++++++---
|
|
|
71c29a3 |
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
71c29a3 |
|
|
|
71c29a3 |
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
|
|
|
71c29a3 |
index 08aabd5..46a52e1 100644
|
|
|
71c29a3 |
--- a/lib/dns/journal.c
|
|
|
71c29a3 |
+++ b/lib/dns/journal.c
|
|
|
71c29a3 |
@@ -307,7 +307,7 @@ struct dns_journal {
|
|
|
71c29a3 |
unsigned int magic; /*%< JOUR */
|
|
|
71c29a3 |
isc_mem_t *mctx; /*%< Memory context */
|
|
|
71c29a3 |
journal_state_t state;
|
|
|
71c29a3 |
- const char *filename; /*%< Journal file name */
|
|
|
71c29a3 |
+ char *filename; /*%< Journal file name */
|
|
|
71c29a3 |
FILE * fp; /*%< File handle */
|
|
|
71c29a3 |
isc_offset_t offset; /*%< Current file offset */
|
|
|
71c29a3 |
journal_header_t header; /*%< In-core journal header */
|
|
|
71c29a3 |
@@ -573,10 +573,13 @@ journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
|
|
|
71c29a3 |
isc_mem_attach(mctx, &j->mctx);
|
|
|
71c29a3 |
j->state = JOURNAL_STATE_INVALID;
|
|
|
71c29a3 |
j->fp = NULL;
|
|
|
71c29a3 |
- j->filename = filename;
|
|
|
71c29a3 |
+ j->filename = isc_mem_strdup(mctx, filename);
|
|
|
71c29a3 |
j->index = NULL;
|
|
|
71c29a3 |
j->rawindex = NULL;
|
|
|
71c29a3 |
|
|
|
71c29a3 |
+ if (j->filename == NULL)
|
|
|
71c29a3 |
+ FAIL(ISC_R_NOMEMORY);
|
|
|
71c29a3 |
+
|
|
|
71c29a3 |
result = isc_stdio_open(j->filename, write ? "rb+" : "rb", &fp);
|
|
|
71c29a3 |
|
|
|
71c29a3 |
if (result == ISC_R_FILENOTFOUND) {
|
|
|
71c29a3 |
@@ -679,6 +682,8 @@ journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
|
|
|
71c29a3 |
sizeof(journal_rawpos_t));
|
|
|
71c29a3 |
j->index = NULL;
|
|
|
71c29a3 |
}
|
|
|
71c29a3 |
+ if (j->filename != NULL)
|
|
|
71c29a3 |
+ isc_mem_free(j->mctx, j->filename);
|
|
|
71c29a3 |
if (j->fp != NULL)
|
|
|
71c29a3 |
(void)isc_stdio_close(j->fp);
|
|
|
71c29a3 |
isc_mem_putanddetach(&j->mctx, j, sizeof(*j));
|
|
|
71c29a3 |
@@ -1242,7 +1247,8 @@ dns_journal_destroy(dns_journal_t **journalp) {
|
|
|
71c29a3 |
isc_mem_put(j->mctx, j->it.target.base, j->it.target.length);
|
|
|
71c29a3 |
if (j->it.source.base != NULL)
|
|
|
71c29a3 |
isc_mem_put(j->mctx, j->it.source.base, j->it.source.length);
|
|
|
71c29a3 |
-
|
|
|
71c29a3 |
+ if (j->filename != NULL)
|
|
|
71c29a3 |
+ isc_mem_free(j->mctx, j->filename);
|
|
|
71c29a3 |
if (j->fp != NULL)
|
|
|
71c29a3 |
(void)isc_stdio_close(j->fp);
|
|
|
71c29a3 |
j->magic = 0;
|
|
|
71c29a3 |
--
|
|
|
71c29a3 |
1.8.3.1
|
|
|
71c29a3 |
|