summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Zumbiehl <florz@florz.de>2010-06-14 14:05:03 -0400
committerNick Mathewson <nickm@torproject.org>2010-06-14 14:05:18 -0400
commit426116113faa9648ac4a000731268c64bfce16cb (patch)
treebb4d94f9552401add29686a6109727138c4e37ae
parent308457218a9e8c41449f00bf0c65ec7124d9b4e8 (diff)
downloadtor-426116113faa9648ac4a000731268c64bfce16cb.tar.gz
tor-426116113faa9648ac4a000731268c64bfce16cb.zip
Save a couple characters' allocation in esc_for_log
-rw-r--r--changes/less_alloc_for_esc3
-rw-r--r--src/common/util.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/less_alloc_for_esc b/changes/less_alloc_for_esc
new file mode 100644
index 0000000000..b10953a30d
--- /dev/null
+++ b/changes/less_alloc_for_esc
@@ -0,0 +1,3 @@
+ o Minor bugfixes
+ - Save a couple bytes in memory allocation every time we escape
+ certain characters in a string. Patch from Florian Zumbiehl.
diff --git a/src/common/util.c b/src/common/util.c
index f5001abe6c..8531d12eba 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -940,6 +940,9 @@ esc_for_log(const char *s)
case '\\':
case '\"':
case '\'':
+ case '\r':
+ case '\n':
+ case '\t':
len += 2;
break;
default: