diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/aaa/mod_authz_dbd.c | 10 | ||||
| -rw-r--r-- | modules/mappers/mod_rewrite.c | 10 | ||||
| -rw-r--r-- | modules/session/mod_session_dbd.c | 3 |
3 files changed, 14 insertions, 9 deletions
diff --git a/modules/aaa/mod_authz_dbd.c b/modules/aaa/mod_authz_dbd.c index 30749914a7..a165eb0ec9 100644 --- a/modules/aaa/mod_authz_dbd.c +++ b/modules/aaa/mod_authz_dbd.c @@ -174,7 +174,9 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg, action, r->user, message?message:noerror); } else if (newuri == NULL) { - newuri = apr_dbd_get_entry(dbd->driver, row, 0); + newuri = + apr_pstrdup(r->pool, + apr_dbd_get_entry(dbd->driver, row, 0)); } /* we can't break out here or row won't get cleaned up */ } @@ -204,7 +206,6 @@ static int authz_dbd_group_query(request_rec *r, authz_dbd_cfg *cfg, apr_dbd_prepared_t *query; apr_dbd_results_t *res = NULL; apr_dbd_row_t *row = NULL; - const char **group; if (cfg->query == NULL) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01649) @@ -224,8 +225,9 @@ static int authz_dbd_group_query(request_rec *r, authz_dbd_cfg *cfg, rv != -1; rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) { if (rv == 0) { - group = apr_array_push(groups); - *group = apr_dbd_get_entry(dbd->driver, row, 0); + APR_ARRAY_PUSH(groups, const char *) = + apr_pstrdup(r->pool, + apr_dbd_get_entry(dbd->driver, row, 0)); } else { message = apr_dbd_error(dbd->driver, dbd->handle, rv); diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index e22a280ad5..dfe18e0672 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -1384,12 +1384,14 @@ static char *lookup_map_dbd(request_rec *r, char *key, const char *label) while ((rv = apr_dbd_get_row(db->driver, r->pool, res, &row, -1)) == 0) { ++n; if (ret == NULL) { - ret = apr_dbd_get_entry(db->driver, row, 0); + ret = apr_pstrdup(r->pool, + apr_dbd_get_entry(db->driver, row, 0)); } else { /* randomise crudely amongst multiple results */ if ((double)rand() < (double)RAND_MAX/(double)n) { - ret = apr_dbd_get_entry(db->driver, row, 0); + ret = apr_pstrdup(r->pool, + apr_dbd_get_entry(db->driver, row, 0)); } } } @@ -1402,11 +1404,11 @@ static char *lookup_map_dbd(request_rec *r, char *key, const char *label) case 0: return NULL; case 1: - return apr_pstrdup(r->pool, ret); + return ret; default: /* what's a fair rewritelog level for this? */ rewritelog((r, 3, NULL, "Multiple values found for %s", key)); - return apr_pstrdup(r->pool, ret); + return ret; } } diff --git a/modules/session/mod_session_dbd.c b/modules/session/mod_session_dbd.c index a6ab40ea6f..cf65e5af3c 100644 --- a/modules/session/mod_session_dbd.c +++ b/modules/session/mod_session_dbd.c @@ -138,7 +138,8 @@ static apr_status_t dbd_load(request_rec * r, const char *key, const char **val) return APR_EGENERAL; } if (*val == NULL) { - *val = apr_dbd_get_entry(dbd->driver, row, 0); + *val = apr_pstrdup(r->pool, + apr_dbd_get_entry(dbd->driver, row, 0)); } /* we can't break out here or row won't get cleaned up */ } |