From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Jan 2008 05:57:14 +0000 (+0000)
Subject:  r17623@catbus:  nickm | 2008-01-15 00:22:04 -0500
X-Git-Tag: tor-0.2.0.16-alpha~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a984011814b3de3c4a300c364893cd6c6cc8ec05;p=thirdparty%2Ftor.git

 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 b09e3c3191..8b34dec156 100644
--- 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.