From d7e29a582f64d6a0552f23339d66b522a4dcef5f Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Sat, 5 Sep 2015 16:58:48 +0000 Subject: [PATCH] Merge r1695170 from trunk: Avoid a crash when lacking correct DB access permissions. PR 57868. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701405 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 ------- modules/mappers/mod_rewrite.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/STATUS b/STATUS index d88b5685ac..f4bbe2d0e8 100644 --- a/STATUS +++ b/STATUS @@ -109,13 +109,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_rewrite: Avoid a crash when lacking correct DB access permissions - when using RewriteMap with MapType dbd or fastdbd. - PR 57868. - trunk: http://svn.apache.org/r1695170 - 2.4.x: trunk works modulo (missing) CHANGES and next-number - +1: jailletc36, ylavic, niq - jailletc36: A CHANGE entry should be added. I forgot it :( PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index f1ed708bff..90cff5c583 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -1338,6 +1338,13 @@ static char *lookup_map_dbd(request_rec *r, char *key, const char *label) char *ret = NULL; int n = 0; ap_dbd_t *db = dbd_acquire(r); + + if (db == NULL) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02963) + "rewritemap: No db handle available! " + "Check your database access"); + return NULL; + } stmt = apr_hash_get(db->prepared, label, APR_HASH_KEY_STRING); -- 2.50.1