I don't seriously expect this solves the segfault ... but it does make

  the code more legible, and protects particularly ugly unset values.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90979 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 4bdeb65942bbe8ba16cc8126fa5c99deb89dfb69..4ec3286e1baf3698a23f0a74942b60e7a701932d 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -188,7 +188,7 @@
 
 #define strIsEmpty(s)    (s == NULL || s[0] == NUL)
 
-#define cfgMerge(el,unset)  new->el = add->el == unset ? base->el : add->el
+#define cfgMerge(el,unset)  new->el = (add->el == (unset)) ? base->el : add->el
 #define cfgMergeArray(el)   new->el = apr_array_append(p, add->el, base->el)
 #define cfgMergeTable(el)   new->el = apr_table_overlay(p, add->el, base->el)
 #define cfgMergeCtx(el)     new->el = apr_table_overlay(p, add->el, base->el)