diff options
| author | Edward Thomson <ethomson@github.com> | 2016-06-14 04:10:11 -1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 04:10:11 -1000 |
| commit | 65e4ab7a333eeda6398fcbf3e663d1ca1c1e53ef (patch) | |
| tree | 7a2449d724c89d02fb6f81f4a0bc7da006f8b34f /src | |
| parent | f0ee795ccb552b87637c7973ac64f64437baa041 (diff) | |
| parent | 13deb8745d6b604a7fc45bb7ddee2a2052e80000 (diff) | |
| download | libgit2-65e4ab7a333eeda6398fcbf3e663d1ca1c1e53ef.tar.gz | |
Merge pull request #3814 from pks-t/pks/invalid-memrefs
Fix invalid memory references
Diffstat (limited to 'src')
| -rw-r--r-- | src/index.c | 5 | ||||
| -rw-r--r-- | src/transports/smart_pkt.c | 1 | ||||
| -rw-r--r-- | src/transports/smart_protocol.c | 11 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/index.c b/src/index.c index 20ab6a19d..32f585faf 100644 --- a/src/index.c +++ b/src/index.c @@ -505,10 +505,11 @@ static int index_remove_entry(git_index *index, size_t pos) int error = 0; 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); + DELETE_IN_MAP(index, entry); + } - DELETE_IN_MAP(index, entry); error = git_vector_remove(&index->entries, pos); if (!error) { diff --git a/src/transports/smart_pkt.c b/src/transports/smart_pkt.c index 2ea57bb64..2297cc94f 100644 --- a/src/transports/smart_pkt.c +++ b/src/transports/smart_pkt.c @@ -433,6 +433,7 @@ int git_pkt_parse_line( * line? */ if (len == PKT_LEN_SIZE) { + *head = NULL; *out = line; return 0; } diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index 02e1ecf74..3448fa7fb 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -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 = 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); git_pkt_free(pkt); @@ -813,6 +821,9 @@ static int parse_report(transport_smart *transport, git_push *push) error = 0; + if (pkt == NULL) + continue; + switch (pkt->type) { case GIT_PKT_DATA: /* This is a sideband packet which contains other packets */ |