summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-12-21 23:28:23 +0000
committerRoger Dingledine <arma@torproject.org>2007-12-21 23:28:23 +0000
commita223f5db034c5f58c79cbe592b81763e535b3f10 (patch)
tree3df5a96249cd0aa157198913469fd23d8a112fbc
parent8f779aee5a16ecbde079ae97189e749f089093ba (diff)
downloadtor-a223f5db034c5f58c79cbe592b81763e535b3f10.tar.gz
tor-a223f5db034c5f58c79cbe592b81763e535b3f10.zip
Fix a crash when accessing hidden services: it would work the first
time you use a given introduction point for your service, but on subsequent requests we'd be using garbage memory. Fixed by Karsten Loesing. Bugfix on 0.2.0.12-alpha. svn:r12913
-rw-r--r--ChangeLog4
-rw-r--r--src/or/rendclient.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1716118b4..b5c07e0390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ Changes in version 0.2.0.14-alpha - 2007-12-??
unexpected (it used to be in our networkstatus when we started
fetching it, but it isn't in our current networkstatus), and we
aren't using bridges. Bugfix on 0.2.0.x.
+ - Fix a crash when accessing hidden services: it would work the first
+ time you use a given introduction point for your service, but
+ on subsequent requests we'd be using garbage memory. Fixed by
+ Karsten Loesing. Bugfix on 0.2.0.12-alpha.
o Minor bugfixes:
- Make the unit tests build again.
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 8401873346..3c5f75552c 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -549,7 +549,6 @@ rend_client_get_random_intro(const char *query)
goto again;
}
extend_info_free(intro->extend_info);
- intro = tor_malloc_zero(sizeof(rend_intro_point_t));
intro->extend_info = extend_info_from_router(router);
}
return extend_info_dup(intro->extend_info);