Attachment 29117 Details for Bug 53452 – Patch to fix segfault

[patch] Patch to fix segfault

HTTPD-53452.patch (text/plain), 1.71 KB, created by Chris on 2012-07-26 03:05:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris

Created: 2012-07-26 03:05:05 UTC

Size: 1.71 KB

patch

obsolete

>Index: modules/session/mod_session_dbd.c
>===================================================================
>--- modules/session/mod_session_dbd.c	(revision 1365799)
>+++ modules/session/mod_session_dbd.c	(working copy)
>@@ -333,18 +333,12 @@
> {
> 
>     apr_status_t rv;
>+    ap_dbd_t *dbd = NULL;
>     apr_dbd_prepared_t *statement;
>     int rows = 0;
> 
>     session_dbd_dir_conf *conf = ap_get_module_config(r->per_dir_config,
>                                                       &session_dbd_module);
>-    ap_dbd_t *dbd = session_dbd_acquire_fn(r);
>-    if (dbd == NULL) {
>-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01861)
>-                      "failed to acquire database connection to remove "
>-                      "session with key '%s'", key);
>-        return APR_EGENERAL;
>-    }
> 
>     if (conf->deletelabel == NULL) {
>         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01862)
>@@ -352,17 +346,11 @@
>         return APR_EGENERAL;
>     }
> 
>-    statement = apr_hash_get(dbd->prepared, conf->deletelabel,
>-                             APR_HASH_KEY_STRING);
>-    if (statement == NULL) {
>-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01863)
>-                      "prepared statement could not be found for "
>-                      "SessionDBDdeletelabel with the label '%s'",
>-                      conf->deletelabel);
>-        return APR_EGENERAL;
>-    }
>+    rv = dbd_init(r, conf->deletelabel, &dbd, &statement);
>+
>     rv = apr_dbd_pvbquery(dbd->driver, r->pool, dbd->handle, &rows, statement,
>                           key, NULL);
>+
>     if (rv != APR_SUCCESS) {
>         ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01864)
>                       "query execution error removing session '%s' "

Actions: View | Diff

Attachments on bug 53452: 29117