proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-07 13:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkt: don't use strlen before we know the name is NUL-terminated

Browse Source 
Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
This commit is contained in:
Carlos Martín Nieto 2011-09-07 16:35:11 +02:00
parent db84b7988b
commit 76a9081db2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pkt.c
View File

@ -104,7 +104,7 @@ static int pack_pkt(git_pkt **out)
static int ref_pkt(git_pkt **out, const char *line, size_t len) static int ref_pkt(git_pkt **out, const char *line, size_t len)
{ {
git_pkt_ref *pkt; git_pkt_ref *pkt;
int error, has_caps = 0; int error;
pkt = git__malloc(sizeof(git_pkt_ref)); pkt = git__malloc(sizeof(git_pkt_ref));
if (pkt == NULL) if (pkt == NULL)
@ -128,9 +128,6 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
line += GIT_OID_HEXSZ + 1; line += GIT_OID_HEXSZ + 1;
len -= (GIT_OID_HEXSZ + 1); len -= (GIT_OID_HEXSZ + 1);
if (strlen(line) < len)
has_caps = 1;
if (line[len - 1] == '\n') if (line[len - 1] == '\n')
--len; --len;
@ -142,7 +139,7 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
memcpy(pkt->head.name, line, len); memcpy(pkt->head.name, line, len);
pkt->head.name[len] = '\0'; pkt->head.name[len] = '\0';
if (has_caps) { if (strlen(pkt->head.name) < len) {
pkt->capabilities = strchr(pkt->head.name, '\0') + 1; pkt->capabilities = strchr(pkt->head.name, '\0') + 1;
} }