aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-27 23:53:03 -0400
committerNick Mathewson <nickm@torproject.org>2014-03-27 23:53:03 -0400
commitbfe783f167d4d88123117a460cde652707bdb2ef (patch)
tree60acd9ed42f7e51cdc3d84d51c8caba1fe3ff6df
parenta83abcf5ee5cb8fe245bc97e089e082f62921194 (diff)
downloadtor-bfe783f167d4d88123117a460cde652707bdb2ef.tar
tor-bfe783f167d4d88123117a460cde652707bdb2ef.tar.gz
Make dump_desc() use binary mode
Otherwise, it could mung the thing that came over the net on windows, which would defeat the purpose of recording the unparseable thing. Fixes bug 11342; bugfix on 0.2.2.1-alpha.
-rw-r--r--changes/bug113424
-rw-r--r--src/or/routerparse.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug11342 b/changes/bug11342
new file mode 100644
index 000000000..a52a5515e
--- /dev/null
+++ b/changes/bug11342
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - When dumping a malformed directory object to disk, save it in binary
+ mode on windows, not text mode. Fixes bug 11342; bugfix on
+ 0.2.2.1-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 3aa4bdf8a..d52a98259 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -598,7 +598,7 @@ dump_desc(const char *desc, const char *type)
char *content = tor_malloc_zero(filelen);
tor_snprintf(content, filelen, "Unable to parse descriptor of type "
"%s:\n%s", type, desc);
- write_str_to_file(debugfile, content, 0);
+ write_str_to_file(debugfile, content, 1);
log_info(LD_DIR, "Unable to parse descriptor of type %s. See file "
"unparseable-desc in data directory for details.", type);
tor_free(content);