From: George Kadianakis <desnacked@riseup.net>
Date: Thu, 13 Jun 2013 09:18:07 +0000 (+0300)
Subject: Insert the environment variable only if we have options to pass.
X-Git-Tag: tor-0.2.5.1-alpha~105^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c71809d403f1fe84105748583ef0f66b6c778db2;p=thirdparty%2Ftor.git

Insert the environment variable only if we have options to pass.
---

diff --git a/src/or/transports.c b/src/or/transports.c
index 2b129cb0ff..39cb872c23 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -1134,7 +1134,9 @@ get_transport_options_for_server_proxy(const managed_proxy_t *mp)
     smartlist_free(options_tmp_sl);
   } SMARTLIST_FOREACH_END(transport);
 
-  options_string = smartlist_join_strings(string_sl, ";", 0, NULL);
+  if (smartlist_len(string_sl)) {
+    options_string = smartlist_join_strings(string_sl, ";", 0, NULL);
+  }
 
   SMARTLIST_FOREACH(string_sl, char *, t, tor_free(t));
   smartlist_free(string_sl);
@@ -1226,9 +1228,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp)
     {
       char *server_transport_options =
         get_transport_options_for_server_proxy(mp);
-      smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s",
-                             server_transport_options);
-      tor_free(server_transport_options);
+      if (server_transport_options) {
+        smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s",
+                               server_transport_options);
+        tor_free(server_transport_options);
+      }
     }
 
     /* XXX024 Remove the '=' here once versions of obfsproxy which