Skip to content

Commit ce8803a

Browse files
authored
Merge pull request libgit2#4836 from pks-t/pks/smart-packets
Smart packet security fixes
2 parents 84d6f43 + 1bc5b05 commit ce8803a

File tree

4 files changed

+465
-109
lines changed

4 files changed

+465
-109
lines changed

src/transports/smart.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ typedef struct {
9090

9191
typedef struct {
9292
git_pkt_type type;
93-
int len;
93+
size_t len;
9494
char data[GIT_FLEX_ARRAY];
9595
} git_pkt_data;
9696

9797
typedef git_pkt_data git_pkt_progress;
9898

9999
typedef struct {
100100
git_pkt_type type;
101-
int len;
101+
size_t len;
102102
char error[GIT_FLEX_ARRAY];
103103
} git_pkt_err;
104104

@@ -188,7 +188,7 @@ int git_smart__get_push_stream(transport_smart *t, git_smart_subtransport_stream
188188
int git_smart__update_heads(transport_smart *t, git_vector *symrefs);
189189

190190
/* smart_pkt.c */
191-
int git_pkt_parse_line(git_pkt **head, const char *line, const char **out, size_t len);
191+
int git_pkt_parse_line(git_pkt **head, const char **endptr, const char *line, size_t linelen);
192192
int git_pkt_buffer_flush(git_buf *buf);
193193
int git_pkt_send_flush(GIT_SOCKET s);
194194
int git_pkt_buffer_done(git_buf *buf);

0 commit comments

Comments
 (0)