Merge commit '44892440582ee8df1dcace7167e587fdfe1ada6d' into HEAD

This commit is contained in:
Sriram Raman 2011-03-01 22:36:18 -05:00
commit d381573876

View File

@ -541,6 +541,7 @@ android_getaddrinfo_proxy(
if (fread(&name_len, sizeof(name_len), 1, proxy) != 1) { if (fread(&name_len, sizeof(name_len), 1, proxy) != 1) {
break; break;
} }
name_len = ntohl(name_len);
if (name_len != 0) { if (name_len != 0) {
ai->ai_canonname = (char*) malloc(name_len); ai->ai_canonname = (char*) malloc(name_len);
if (fread(ai->ai_canonname, name_len, 1, proxy) != 1) { if (fread(ai->ai_canonname, name_len, 1, proxy) != 1) {