Changeset 3358887 in mod_gnutls

Timestamp:

May 30, 2018, 2:12:49 AM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

994200a

Parents:

eced11a

git-author:

Fiona Klute <fiona.klute@…> (05/30/18 01:43:09)

git-committer:

Fiona Klute <fiona.klute@…> (05/30/18 02:12:49)

Message:

Assign cache configuration to server only if successful

The sc->cache or sc->ocsp_cache will remain NULL if the requested
provider cannot be set up. This is important for the planned default
OCSP cache configuration because checks for sc->ocsp_cache == NULL
will still work if the default configuration cannot be applied.

Location:

src

Files:

• gnutls_cache.c (modified) (2 diffs)
• gnutls_cache.h (modified) (2 diffs)

src/gnutls_cache.c

@@ -314 +314 @@
                                   apr_pool_t *pconf, apr_pool_t *ptemp)
 {
-    /* allocate cache structure if needed */
-    if (*cache == NULL)
-    {
-        *cache = apr_pcalloc(pconf, sizeof(struct mgs_cache));
-        if (*cache == NULL)
-            return "Could not allocate memory for cache configuration!";
-    }
-    mgs_cache_t c = *cache;
+    /* Allocate cache structure, will be assigned to *cache after
+     * successful configuration. */
+    mgs_cache_t c = apr_pcalloc(pconf, sizeof(struct mgs_cache));
+    if (c == NULL)
+        return "Could not allocate memory for cache configuration!";
 
     /* Find the right socache provider */
@@ -355 +352 @@
                  "%s: Socache '%s:%s' created.",
                  __func__, c->prov->name, c->config);
+
+    /* assign configured cache structure to server */
+    *cache = c;
 
     return NULL;

src/gnutls_cache.h

@@ -43 +43 @@
  * is supposed to happen during post_config.
  *
- * @param cache pointer to the mgs_cache_t, memory will be allocated
- * if currently NULL.
+ * @param cache pointer to the mgs_cache_t, will be assigned only if
+ * configuration succeeds
  *
  * @param server associated server for logging purposes
@@ -53 +53 @@
  * `NULL` if the provider accepts an empty configuration
  *
- * @param pconf configuration memory pool
+ * @param pconf configuration memory pool, used to store cache
+ * configuration
  *
  * @param ptemp temporary memory pool