Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
65e4ab7a
Commit
65e4ab7a
authored
Jun 14, 2016
by
Edward Thomson
Committed by
GitHub
Jun 14, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3814 from pks-t/pks/invalid-memrefs
Fix invalid memory references
parents
f0ee795c
13deb874
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
src/index.c
+3
-2
src/transports/smart_pkt.c
+1
-0
src/transports/smart_protocol.c
+11
-0
No files found.
src/index.c
View file @
65e4ab7a
...
...
@@ -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
)
{
...
...
src/transports/smart_pkt.c
View file @
65e4ab7a
...
...
@@ -433,6 +433,7 @@ int git_pkt_parse_line(
* line?
*/
if
(
len
==
PKT_LEN_SIZE
)
{
*
head
=
NULL
;
*
out
=
line
;
return
0
;
}
...
...
src/transports/smart_protocol.c
View file @
65e4ab7a
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment