From: Nick Kew <niq@apache.org>
Date: Wed, 16 Nov 2005 21:20:33 +0000 (+0000)
Subject: Add defaults and comments for better robustness against misuse
X-Git-Tag: 2.3.0~2751
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54c8162ce532ed3bc415c2794a89e54bf276deb3;p=thirdparty%2Fapache%2Fhttpd.git

Add defaults and comments for better robustness against misuse
(based on comments from Chris Darroch).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345128 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 1144fba53bb..7a7aa2ffdb1 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -185,6 +185,7 @@ static void *dbd_cfg(apr_pool_t *p, server_rec *x)
 {
     svr_cfg *svr = (svr_cfg*) apr_pcalloc(p, sizeof(svr_cfg));
     svr->persist = -1;
+    svr->name = svr->params = ""; /* don't risk segfault on misconfiguration */
 #if APR_HAS_THREADS
     svr->nmin = DEFAULT_NMIN;
     svr->nkeep = DEFAULT_NKEEP;
diff --git a/modules/database/mod_dbd.h b/modules/database/mod_dbd.h
index f98df9948e1..83f2535d1c8 100644
--- a/modules/database/mod_dbd.h
+++ b/modules/database/mod_dbd.h
@@ -64,7 +64,10 @@ AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
  */
 AP_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
 
-/* Prepare a statement for use by a client module */
+/* Prepare a statement for use by a client module during
+ * the server startup/configuration phase.  Can't be called
+ * after the server has created its children (use apr_dbd_*).
+ */
 AP_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
 
 /* Also export them as optional functions for modules that prefer it */