nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r7386@Kushana: nickm | 2006-08-14 17:43:44 -0400

Browse Source 
Patch from Adam Langley.
 
  * I meant getaddrinfo_a, not getaddrinfo_r - fixed
  * Added more checks to the parsing code.
  * It seems you switched an alloca to a malloc, but didn't add any frees
 


svn:r7061
This commit is contained in:
Nick Mathewson 2006-08-14 21:44:45 +00:00
parent 27c2a9a0d4
commit bc21df6a5c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/or/eventdns.c
View File

@ -3,7 +3,7 @@
/* The original version of this module was written by Adam Langley; for /* The original version of this module was written by Adam Langley; for
* a history of modifications, check out the subversion logs. * a history of modifications, check out the subversion logs.
* *
* When editiing this module, try to keep it re-mergeable by Adam. Don't * When editing this module, try to keep it re-mergeable by Adam. Don't
* reformat the whitespace, add Tor dependencies, or so on. * reformat the whitespace, add Tor dependencies, or so on.
* *
* TODO: * TODO:
@ -39,11 +39,9 @@
* Async DNS lookups are really a whole lot harder than they should be, * Async DNS lookups are really a whole lot harder than they should be,
* mostly stemming from the fact that the libc resolver has never been * mostly stemming from the fact that the libc resolver has never been
* very good at them. Before you use this library you should see if libc * very good at them. Before you use this library you should see if libc
* can do the job for you with the modern async call getaddrinfo_r * can do the job for you with the modern async call getaddrinfo_a
* (Google for it). Otherwise, please continue. * (see http://www.imperialviolet.org/page25.html#e498). Otherwise,
* * please continue.
* [I googled for getaddrinfo_r and got only two hits, one of which was this
* code. Did you mean something different? -NM]
* *
* This code is based on libevent and you must call event_init before * This code is based on libevent and you must call event_init before
* any of the APIs in this file. You must also seed the OpenSSL random * any of the APIs in this file. You must also seed the OpenSSL random
@ -783,6 +781,7 @@ reply_parse(u8 *packet, int length) {
// packet. The name stops after a pointer like that. // packet. The name stops after a pointer like that.
#define SKIP_NAME \ #define SKIP_NAME \
for(;;) { \ for(;;) { \
if (j >= length) return;
u8 label_len; \ u8 label_len; \
GET8(label_len); \ GET8(label_len); \
if (!label_len) break; \ if (!label_len) break; \
@ -800,6 +799,7 @@ reply_parse(u8 *packet, int length) {
// <label:name><u16:type><u16:class> // <label:name><u16:type><u16:class>
SKIP_NAME; SKIP_NAME;
j += 4; j += 4;
if (j >= length) return;
} }
// now we have the answer section which looks like // now we have the answer section which looks like
@ -1054,9 +1054,13 @@ eventdns_request_data_build(const char *const name, const int name_len, const u1
labels = (u8 *) malloc(name_len + 2); labels = (u8 *) malloc(name_len + 2);
if (!labels) return -1; if (!labels) return -1;
labels_len = dnsname_to_labels(labels, name, name_len); labels_len = dnsname_to_labels(labels, name, name_len);
if (labels_len < 0) return labels_len; if (labels_len < 0) {
free(labels);
return labels_len;
}
memcpy(buf + j, labels, labels_len); memcpy(buf + j, labels, labels_len);
j += labels_len; j += labels_len;
free(labels);
APPEND16(type); APPEND16(type);
APPEND16(class); APPEND16(class);