January 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug24826_031' into maint-0.3.1
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit f406b9df0533c9730b4537b39f3a7f8d232f3558 Merge: af8cadf3a 4bb831e08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:45 2018 -0500 Merge branch 'bug24826_031' into maint-0.3.1 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'bug24826_031' into maint-0.3.1
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit f406b9df0533c9730b4537b39f3a7f8d232f3558 Merge: af8cadf3a 4bb831e08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:45 2018 -0500 Merge branch 'bug24826_031' into maint-0.3.1 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'bug24826_031' into maint-0.3.1
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit f406b9df0533c9730b4537b39f3a7f8d232f3558 Merge: af8cadf3a 4bb831e08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:45 2018 -0500 Merge branch 'bug24826_031' into maint-0.3.1 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 44388757c44834d63614c4e13cf88931992afc2a Merge: 4e653ac2c f406b9df0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 256cd9d8777aac7cb8fd6028ef518fdcf8ab744d Merge: 83648ef07 f406b9df0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit c8a27d89b26394a0e802820fe891ef75787499ab Merge: 77026f8a8 44388757c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Improve fragile-hardening performance of consensus_split_lines.
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 12:42:40 2018 -0500 Improve fragile-hardening performance of consensus_split_lines. For whatever reason, in my testing, using memchr() here improves performance over strchr() by a great deal. Fixes bug 24826; bugfix on 0.3.1.1-alpha. --- changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24826_031 b/changes/bug24826_031 new file mode 100644 index 000000000..3d4a66184 --- /dev/null +++ b/changes/bug24826_031 @@ -0,0 +1,4 @@ + o Minor bugfixes (performance, fragile-hardening): + - Improve the performance of our consensus-diff application code when Tor + is built with the --enable-fragile-hardening option set. Fixes bug + 24826; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 1baa11897..deaf465fe 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1, STATIC int consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area) { + const char *end_of_str = s + strlen(s); + tor_assert(*end_of_str == '\0'); + while (*s) { - const char *eol = strchr(s, '\n'); + const char *eol = memchr(s, '\n', end_of_str - s); if (!eol) { /* File doesn't end with newline. */ return -1;

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit c9b4ddc882c93984359172e3e50f785080751558 Merge: 4bfc35579 44388757c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 44388757c44834d63614c4e13cf88931992afc2a Merge: 4e653ac2c f406b9df0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Improve fragile-hardening performance of consensus_split_lines.
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 12:42:40 2018 -0500 Improve fragile-hardening performance of consensus_split_lines. For whatever reason, in my testing, using memchr() here improves performance over strchr() by a great deal. Fixes bug 24826; bugfix on 0.3.1.1-alpha. --- changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24826_031 b/changes/bug24826_031 new file mode 100644 index 000000000..3d4a66184 --- /dev/null +++ b/changes/bug24826_031 @@ -0,0 +1,4 @@ + o Minor bugfixes (performance, fragile-hardening): + - Improve the performance of our consensus-diff application code when Tor + is built with the --enable-fragile-hardening option set. Fixes bug + 24826; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 1baa11897..deaf465fe 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1, STATIC int consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area) { + const char *end_of_str = s + strlen(s); + tor_assert(*end_of_str == '\0'); + while (*s) { - const char *eol = strchr(s, '\n'); + const char *eol = memchr(s, '\n', end_of_str - s); if (!eol) { /* File doesn't end with newline. */ return -1;

1 0