зеркало из https://github.com/microsoft/git.git
Merge branch 'ys/fsck-commit-parsing'
* ys/fsck-commit-parsing: fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant fsck.c:fsck_ident(): ident points at a const string
This commit is contained in:
Коммит
40adf520a3
26
fsck.c
26
fsck.c
|
@ -243,7 +243,7 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsck_ident(char **ident, struct object *obj, fsck_error error_func)
|
static int fsck_ident(const char **ident, struct object *obj, fsck_error error_func)
|
||||||
{
|
{
|
||||||
char *end;
|
char *end;
|
||||||
|
|
||||||
|
@ -284,21 +284,23 @@ static int fsck_ident(char **ident, struct object *obj, fsck_error error_func)
|
||||||
|
|
||||||
static int fsck_commit(struct commit *commit, fsck_error error_func)
|
static int fsck_commit(struct commit *commit, fsck_error error_func)
|
||||||
{
|
{
|
||||||
char *buffer = commit->buffer;
|
const char *buffer = commit->buffer, *tmp;
|
||||||
unsigned char tree_sha1[20], sha1[20];
|
unsigned char tree_sha1[20], sha1[20];
|
||||||
struct commit_graft *graft;
|
struct commit_graft *graft;
|
||||||
int parents = 0;
|
int parents = 0;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (memcmp(buffer, "tree ", 5))
|
buffer = skip_prefix(buffer, "tree ");
|
||||||
|
if (!buffer)
|
||||||
return error_func(&commit->object, FSCK_ERROR, "invalid format - expected 'tree' line");
|
return error_func(&commit->object, FSCK_ERROR, "invalid format - expected 'tree' line");
|
||||||
if (get_sha1_hex(buffer+5, tree_sha1) || buffer[45] != '\n')
|
if (get_sha1_hex(buffer, tree_sha1) || buffer[40] != '\n')
|
||||||
return error_func(&commit->object, FSCK_ERROR, "invalid 'tree' line format - bad sha1");
|
return error_func(&commit->object, FSCK_ERROR, "invalid 'tree' line format - bad sha1");
|
||||||
buffer += 46;
|
buffer += 41;
|
||||||
while (!memcmp(buffer, "parent ", 7)) {
|
while ((tmp = skip_prefix(buffer, "parent "))) {
|
||||||
if (get_sha1_hex(buffer+7, sha1) || buffer[47] != '\n')
|
buffer = tmp;
|
||||||
|
if (get_sha1_hex(buffer, sha1) || buffer[40] != '\n')
|
||||||
return error_func(&commit->object, FSCK_ERROR, "invalid 'parent' line format - bad sha1");
|
return error_func(&commit->object, FSCK_ERROR, "invalid 'parent' line format - bad sha1");
|
||||||
buffer += 48;
|
buffer += 41;
|
||||||
parents++;
|
parents++;
|
||||||
}
|
}
|
||||||
graft = lookup_commit_graft(commit->object.sha1);
|
graft = lookup_commit_graft(commit->object.sha1);
|
||||||
|
@ -322,15 +324,15 @@ static int fsck_commit(struct commit *commit, fsck_error error_func)
|
||||||
if (p || parents)
|
if (p || parents)
|
||||||
return error_func(&commit->object, FSCK_ERROR, "parent objects missing");
|
return error_func(&commit->object, FSCK_ERROR, "parent objects missing");
|
||||||
}
|
}
|
||||||
if (memcmp(buffer, "author ", 7))
|
buffer = skip_prefix(buffer, "author ");
|
||||||
|
if (!buffer)
|
||||||
return error_func(&commit->object, FSCK_ERROR, "invalid format - expected 'author' line");
|
return error_func(&commit->object, FSCK_ERROR, "invalid format - expected 'author' line");
|
||||||
buffer += 7;
|
|
||||||
err = fsck_ident(&buffer, &commit->object, error_func);
|
err = fsck_ident(&buffer, &commit->object, error_func);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
if (memcmp(buffer, "committer ", strlen("committer ")))
|
buffer = skip_prefix(buffer, "committer ");
|
||||||
|
if (!buffer)
|
||||||
return error_func(&commit->object, FSCK_ERROR, "invalid format - expected 'committer' line");
|
return error_func(&commit->object, FSCK_ERROR, "invalid format - expected 'committer' line");
|
||||||
buffer += strlen("committer ");
|
|
||||||
err = fsck_ident(&buffer, &commit->object, error_func);
|
err = fsck_ident(&buffer, &commit->object, error_func);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче