[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] stop freeing the new global options list whenever we update...
Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or
Modified Files:
config.c
Log Message:
stop freeing the new global options list whenever we update it.
Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -d -r1.399 -r1.400
--- config.c 26 Aug 2005 20:07:55 -0000 1.399
+++ config.c 26 Aug 2005 20:26:20 -0000 1.400
@@ -364,12 +364,14 @@
{
or_options_t *old_options = global_options;
global_options = new_val;
+ /* Note that we pass the *old* options below, for comparison. It
+ * pulls the new options directly out of global_options. */
if (options_act(old_options) < 0) { /* acting on the options failed. die. */
log_fn(LOG_ERR,"Acting on config options left us in a broken state. Dying.");
exit(1);
}
if (old_options)
- config_free(&options_format, global_options);
+ config_free(&options_format, old_options);
}
void