[tor-commits] [tor/master] Make dump_desc() use binary mode

[nickm@xxxxxxxxxxxxxx]

commit bfe783f167d4d88123117a460cde652707bdb2ef
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Mar 27 23:53:03 2014 -0400

    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.
---
 changes/bug11342     |    4 ++++
 src/or/routerparse.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug11342 b/changes/bug11342
new file mode 100644
index 0000000..a52a551
--- /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 3aa4bdf..d52a982 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);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits