Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some leaks reported by Coverity scan #143

Merged
merged 2 commits into from
Jan 30, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 48 additions & 11 deletions plugins/http/spdy3.c
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,21 @@ static ssize_t spdy_inflate_http_headers(struct http_session *hr) {
inflateSetDictionary(&hr->spdy_z_in, (Bytef *) SPDY_dictionary_txt, sizeof(SPDY_dictionary_txt));
ret = inflate(&hr->spdy_z_in, Z_NO_FLUSH);
}
if (ret != Z_OK) return -1;
if (ret != Z_OK) {
uwsgi_buffer_destroy(ub);
return -1;
}
size_t zlen = hr->spdy_z_in.next_out-zbuf;
if (uwsgi_buffer_append(ub, (char *) zbuf, zlen)) return -1;
if (uwsgi_buffer_append(ub, (char *) zbuf, zlen)) {
uwsgi_buffer_destroy(ub);
return -1;
}
}

if (ub->pos < 4) return -1;
if (ub->pos < 4) {
uwsgi_buffer_destroy(ub);
return -1;
}

uint32_t headers_num = uwsgi_be32(ub->buf);
uint32_t i, watermark = ub->pos, pos = 4;
Expand All @@ -466,26 +475,45 @@ static ssize_t spdy_inflate_http_headers(struct http_session *hr) {
// leave space for header
for(i=0;i<headers_num;i++) {
// key
if (pos + 4 > watermark) return -1;
if (pos + 4 > watermark) {
uwsgi_buffer_destroy(ub);
return -1;
}
uint32_t k_len = uwsgi_be32( ub->buf + pos);
pos += 4;
if (pos + k_len > watermark) return -1;
if (pos + k_len > watermark) {
uwsgi_buffer_destroy(ub);
return -1;
}
char *k = ub->buf + pos;
pos += k_len;

// value
if (pos + 4 > watermark) return -1;
if (pos + 4 > watermark) {
uwsgi_buffer_destroy(ub);
return -1;
}
uint32_t v_len = uwsgi_be32( ub->buf + pos);
pos += 4;
if (pos + v_len > watermark) return -1;
if (pos + v_len > watermark) {
uwsgi_buffer_destroy(ub);
return -1;
}
char *v = ub->buf + pos;
pos += v_len;

uint16_t nk_len = 0;
char *cgi_name = spdy_translate(k, k_len, &nk_len);
if (!cgi_name) return -1;
if (!cgi_name) {
uwsgi_buffer_destroy(ub);
return -1;
}

if (uwsgi_buffer_append_keyval(new_peer->out, cgi_name, nk_len, v, v_len)) {
uwsgi_buffer_destroy(ub);
return -1;
}

if (uwsgi_buffer_append_keyval(new_peer->out, cgi_name, nk_len, v, v_len)) return -1;
if (!uwsgi_strncmp(cgi_name, nk_len, "HTTP_HOST", 9)) {
new_peer->key = new_peer->out->buf + (new_peer->out->pos - v_len);
new_peer->key_len = v_len;
Expand All @@ -498,12 +526,21 @@ static ssize_t spdy_inflate_http_headers(struct http_session *hr) {
query_string++;
path_info_len = (query_string - path_info) -1;
uint16_t query_string_len = v_len - (path_info_len + 1);
if (uwsgi_buffer_append_keyval(new_peer->out, "QUERY_STRING", 12, query_string, query_string_len)) return -1;
if (uwsgi_buffer_append_keyval(new_peer->out, "QUERY_STRING", 12, query_string, query_string_len)) {
free(cgi_name);
uwsgi_buffer_destroy(ub);
return -1;
}
}
if (uwsgi_buffer_append_keyval(new_peer->out, "PATH_INFO", 9, path_info, path_info_len)) {
free(cgi_name);
uwsgi_buffer_destroy(ub);
return -1;
}
if (uwsgi_buffer_append_keyval(new_peer->out, "PATH_INFO", 9, path_info, path_info_len)) return -1;
}
free(cgi_name);
}
uwsgi_buffer_destroy(ub);

// find the backend node
if (new_peer->key_len == 0) return -1;
Expand Down
2 changes: 2 additions & 0 deletions proto/zeromq.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,13 +603,15 @@ ssize_t uwsgi_proto_zeromq_writev_header(struct wsgi_request *wsgi_req, struct i
for (i = 0; i < (int) iov_len; i++) {
if (uwsgi_buffer_append(ub, iovec[i].iov_base, iovec[i].iov_len)) {
wsgi_req->write_errors++;
uwsgi_buffer_destroy(ub);
return 0;
}
}

len = uwsgi_proto_zeromq_write(wsgi_req, ub->buf, ub->pos);
if (len <= 0) {
wsgi_req->write_errors++;
uwsgi_buffer_destroy(ub);
return 0;
}

Expand Down