Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2012-07-17 11:10:44 -04:00
commit 01b65ab872

5
http.c
View File

@ -2817,9 +2817,8 @@ evhttp_uriencode(const char *uri, ev_ssize_t len, int space_as_plus)
} }
evbuffer_add(buf, "", 1); /* NUL-terminator. */ evbuffer_add(buf, "", 1); /* NUL-terminator. */
result = mm_malloc(evbuffer_get_length(buf)); result = mm_malloc(evbuffer_get_length(buf));
if (!result) if (result)
return NULL; evbuffer_remove(buf, result, evbuffer_get_length(buf));
evbuffer_remove(buf, result, evbuffer_get_length(buf));
evbuffer_free(buf); evbuffer_free(buf);
return (result); return (result);