proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 18:22:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3814 from pks-t/pks/invalid-memrefs

Browse Source 
Fix invalid memory references
This commit is contained in:
Edward Thomson 2016-06-14 04:10:11 -10:00 committed by GitHub
commit 65e4ab7a33
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/index.c
View File

@ -505,10 +505,11 @@ static int index_remove_entry(git_index *index, size_t pos)
int error = 0; int error = 0;
git_index_entry *entry = git_vector_get(&index->entries, pos); git_index_entry *entry = git_vector_get(&index->entries, pos);
if (entry != NULL) if (entry != NULL) {
git_tree_cache_invalidate_path(index->tree, entry->path); git_tree_cache_invalidate_path(index->tree, entry->path);
DELETE_IN_MAP(index, entry);
}
DELETE_IN_MAP(index, entry);
error = git_vector_remove(&index->entries, pos); error = git_vector_remove(&index->entries, pos);
if (!error) { if (!error) {

1
src/transports/smart_pkt.c
View File

@ -433,6 +433,7 @@ int git_pkt_parse_line(
* line? * line?
*/ */
if (len == PKT_LEN_SIZE) { if (len == PKT_LEN_SIZE) {
*head = NULL;
*out = line; *out = line;
return 0; return 0;
} }

11
src/transports/smart_protocol.c
View File

@ -759,6 +759,14 @@ static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt,
line_len -= (line_end - line); line_len -= (line_end - line);
line = line_end; line = line_end;
/* When a valid packet with no content has been
* read, git_pkt_parse_line does not report an
* error, but the pkt pointer has not been set.
* Handle this by skipping over empty packets.
*/
if (pkt == NULL)
continue;
error = add_push_report_pkt(push, pkt); error = add_push_report_pkt(push, pkt);
git_pkt_free(pkt); git_pkt_free(pkt);
@ -813,6 +821,9 @@ static int parse_report(transport_smart *transport, git_push *push)
error = 0; error = 0;
if (pkt == NULL)
continue;
switch (pkt->type) { switch (pkt->type) {
case GIT_PKT_DATA: case GIT_PKT_DATA:
/* This is a sideband packet which contains other packets */ /* This is a sideband packet which contains other packets */