[rt-commit] r179 - in /redwax-tool/trunk: ChangeLog redwax_keychain.c

[rt-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Tue May 28 20:15:05 2024
New Revision: 179

Log:
Fix a crash triggered when keychain is present but
not used.

Modified:
    redwax-tool/trunk/ChangeLog
    redwax-tool/trunk/redwax_keychain.c

Modified: redwax-tool/trunk/ChangeLog
==============================================================================
--- redwax-tool/trunk/ChangeLog	(original)
+++ redwax-tool/trunk/ChangeLog	Tue May 28 20:15:05 2024
@@ -1,5 +1,8 @@
 
 Changes with v0.9.5
+
+ *) Fix a crash triggered when keychain is present but
+    not used. [Graham Leggett]
 
  *) Add calculation of TLSA records to metadata-out.
     [Graham Leggett]

Modified: redwax-tool/trunk/redwax_keychain.c
==============================================================================
--- redwax-tool/trunk/redwax_keychain.c	(original)
+++ redwax-tool/trunk/redwax_keychain.c	Tue May 28 20:15:05 2024
@@ -125,9 +125,9 @@
 
             if (err == errSecSuccess) {
 
-            	name = apr_pstrndup(r->pool, buffer, len);
-
-            	apr_hash_set(paths, name, APR_HASH_KEY_STRING, name);
+                name = apr_pstrndup(r->pool, buffer, len);
+
+                apr_hash_set(paths, name, APR_HASH_KEY_STRING, name);
 
             }
 
@@ -659,7 +659,7 @@
 
     config = redwax_get_module_config(r->per_module, &keychain_module);
 
-    if (cert->der && config->in) {
+    if (cert->der && config && config->in) {
 
         OSStatus err;