Changeset d8d6b1e in mod_gnutls for src

Timestamp:

Apr 29, 2018, 6:33:34 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

f52f1b4

Parents:

a314ec9

Message:

Reallocate buffer to data size after fetching from socache

There is no way to know the size of an socache object before fetching,
so the provided buffer must be large. To avoid wasting memory shrink
the buffer to the actual size of the object after fetching.

File:

• src/gnutls_cache.c (modified) (2 diffs)

src/gnutls_cache.c

@@ -165 +165 @@
 
 
-// 4K should be enough for OCSP responses and sessions alike
-#define SOCACHE_FETCH_BUF_SIZE 4096
+/** 8K is the maximum size accepted when receiving OCSP responses,
+ * sessions cache entries should be much smaller. The buffer is
+ * reallocated to actual size after fetching, so memory waste is
+ * minimal and temporary. */
+#define SOCACHE_FETCH_BUF_SIZE (8 * 1024)
+
 gnutls_datum_t mgs_cache_fetch(mgs_cache_t cache, server_rec *server,
                                gnutls_datum_t key, apr_pool_t *pool)
@@ -212 +216 @@
                      "fetched %u bytes from cache '%s:%s'",
                      data.size, cache->prov->name, sc->cache->config);
+
+        /* Realloc buffer to data.size. Data size must be less than or
+         * equal to the initial buffer size, so this REALLY should not
+         * fail. */
+        data.data = gnutls_realloc(data.data, data.size);
+        if (__builtin_expect(data.data == NULL, 0))
+        {
+            ap_log_error(APLOG_MARK, APLOG_CRIT, APR_ENOMEM, server,
+                         "%s: Could not realloc fetch buffer to data size!",
+                         __func__);
+            data.size = 0;
+        }
     }
     apr_pool_destroy(spool);