r17623@catbus: nickm | 2008-01-15 00:22:04 -0500

 bulletproof option_get_canonical_name()

svn:r13135

diff --git a/src/or/config.c b/src/or/config.c
index b09e3c3191597b9db494b82aa0d0d008286c1330..8b34dec1563ef7ac75fa8beff80b1f3808cf7f73 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1683,12 +1683,13 @@ option_is_recognized(const char *key)
   return (var != NULL);
 }
 
-/** Return the canonical name of a configuration option. */
+/** Return the canonical name of a configuration option, or NULL
+ * if no such option exists. */
 const char *
 option_get_canonical_name(const char *key)
 {
   config_var_t *var = config_find_option(&options_format, key);
-  return var->name;
+  return var ? var->name : NULL;
 }
 
 /** Return a canonicalized list of the options assigned for key.