Changeset 929d313 in mod_gnutls

Timestamp:

Jan 29, 2013, 8:05:42 PM (8 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

421ef1c

Parents:

480aba1

git-author:

Daniel Kahn Gillmor <dkg@…> (01/28/13 20:31:32)

git-committer:

Daniel Kahn Gillmor <dkg@…> (01/29/13 20:05:42)

Message:

avoid use-after-free in mgs_set_key_file()

File:

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

src/gnutls_config.c

@@ -131 +131 @@
     const char *file;
     apr_pool_t *spool;
+    const char *out;
 
         mgs_srvconf_rec *sc = (mgs_srvconf_rec *) ap_get_module_config(parms->server->module_config, &gnutls_module);
@@ -139 +140 @@
 
     if (load_datum_from_file(spool, file, &data) != 0) {
+        out = apr_psprintf(parms->pool, "GnuTLS: Error Reading Private Key '%s'", file);
                 apr_pool_destroy(spool);
-        return apr_psprintf(parms->pool, "GnuTLS: Error Reading Private Key '%s'", file);
+        return out;
     }
 
@@ -157 +159 @@
 
     if (ret < 0) {
+        out = apr_psprintf(parms->pool, "GnuTLS: Failed to Import Private Key '%s': (%d) %s", file, ret, gnutls_strerror(ret));
                 apr_pool_destroy(spool);
-        return apr_psprintf(parms->pool, "GnuTLS: Failed to Import Private Key '%s': (%d) %s", file, ret, gnutls_strerror(ret));
+        return out;
     }