Changeset eee1432 in mod_gnutls for src/gnutls_config.c

Timestamp:

Jun 15, 2016, 6:12:50 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

44e8944

Parents:

45b7b83

Message:

Bind temporary pool in mgs_load_files() to ptemp scope

Pool 'spool' is destroyed at the end of the function, so the temporary
scope is definitely appropriate. This ensures cleanup in case a bug
prevents explicit pool destruction.

File:

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

src/gnutls_config.c

@@ -176 +176 @@
 }
 
-int mgs_load_files(apr_pool_t * p, server_rec * s)
+int mgs_load_files(apr_pool_t *pconf, apr_pool_t *ptemp, server_rec *s)
 {
     apr_pool_t *spool;
@@ -186 +186 @@
                                                  &gnutls_module);
 
-    apr_pool_create(&spool, p);
-
-    sc->cert_pgp = apr_pcalloc(p, sizeof(sc->cert_pgp[0]));
-    sc->cert_crt_pgp = apr_pcalloc(p, sizeof(sc->cert_crt_pgp[0]));
+    apr_pool_create(&spool, ptemp);
+
+    sc->cert_pgp = apr_pcalloc(pconf, sizeof(sc->cert_pgp[0]));
+    sc->cert_crt_pgp = apr_pcalloc(pconf, sizeof(sc->cert_crt_pgp[0]));
     sc->certs_x509_chain =
-        apr_pcalloc(p, MAX_CHAIN_SIZE * sizeof(sc->certs_x509_chain[0]));
+        apr_pcalloc(pconf, MAX_CHAIN_SIZE * sizeof(sc->certs_x509_chain[0]));
     sc->certs_x509_crt_chain =
-        apr_pcalloc(p, MAX_CHAIN_SIZE * sizeof(sc->certs_x509_crt_chain[0]));
+        apr_pcalloc(pconf, MAX_CHAIN_SIZE * sizeof(sc->certs_x509_crt_chain[0]));
 
     /* Cleanup function for the GnuTLS structures allocated below */
-    apr_pool_cleanup_register(p, sc, mgs_pool_free_credentials,
+    apr_pool_cleanup_register(pconf, sc, mgs_pool_free_credentials,
                               apr_pool_cleanup_null);