Changeset 83eafed in mod_gnutls

Timestamp:

Feb 17, 2014, 4:32:08 PM (9 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

460c048

Parents:

bce7907

Message:

avoid a very unlikely NULL dereference

File:

• src/gnutls_hooks.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -454 +454 @@
 
     {
-        char* gnutls_version = apr_psprintf(p, "GnuTLS/%s", gnutls_check_version(NULL));
-        if( !gnutls_version ) {
+        const char* libvers = gnutls_check_version(NULL);
+        char* gnutls_version = NULL;
+        if(libvers && (gnutls_version = apr_psprintf(p, "GnuTLS/%s", libvers))) {
+            ap_add_version_component(p, gnutls_version);
+        } else {
             // In case we could not create the above string go for the static version instead
             ap_add_version_component(p, "GnuTLS/" GNUTLS_VERSION "-static");
-        } else {
-            ap_add_version_component(p, gnutls_version);
         }
     }