13019d4136
This patch fixes memory leaks in parse_object() and related functions; these leaks were very noticeable when running git-fsck-cache. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
143 lines
3.2 KiB
C
143 lines
3.2 KiB
C
#include "commit.h"
|
|
#include "cache.h"
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
|
|
const char *commit_type = "commit";
|
|
|
|
struct commit *lookup_commit(unsigned char *sha1)
|
|
{
|
|
struct object *obj = lookup_object(sha1);
|
|
if (!obj) {
|
|
struct commit *ret = xmalloc(sizeof(struct commit));
|
|
memset(ret, 0, sizeof(struct commit));
|
|
created_object(sha1, &ret->object);
|
|
ret->object.type = commit_type;
|
|
return ret;
|
|
}
|
|
if (obj->type != commit_type) {
|
|
error("Object %s is a %s, not a commit",
|
|
sha1_to_hex(sha1), obj->type);
|
|
return NULL;
|
|
}
|
|
return (struct commit *) obj;
|
|
}
|
|
|
|
static unsigned long parse_commit_date(const char *buf)
|
|
{
|
|
unsigned long date;
|
|
|
|
if (memcmp(buf, "author", 6))
|
|
return 0;
|
|
while (*buf++ != '\n')
|
|
/* nada */;
|
|
if (memcmp(buf, "committer", 9))
|
|
return 0;
|
|
while (*buf++ != '>')
|
|
/* nada */;
|
|
date = strtoul(buf, NULL, 10);
|
|
if (date == ULONG_MAX)
|
|
date = 0;
|
|
return date;
|
|
}
|
|
|
|
int parse_commit(struct commit *item)
|
|
{
|
|
char type[20];
|
|
void * buffer, *bufptr;
|
|
unsigned long size;
|
|
unsigned char parent[20];
|
|
if (item->object.parsed)
|
|
return 0;
|
|
item->object.parsed = 1;
|
|
buffer = bufptr = read_sha1_file(item->object.sha1, type, &size);
|
|
if (!buffer)
|
|
return error("Could not read %s",
|
|
sha1_to_hex(item->object.sha1));
|
|
if (strcmp(type, commit_type)) {
|
|
free(buffer);
|
|
return error("Object %s not a commit",
|
|
sha1_to_hex(item->object.sha1));
|
|
}
|
|
get_sha1_hex(bufptr + 5, parent);
|
|
item->tree = lookup_tree(parent);
|
|
if (item->tree)
|
|
add_ref(&item->object, &item->tree->object);
|
|
bufptr += 46; /* "tree " + "hex sha1" + "\n" */
|
|
while (!memcmp(bufptr, "parent ", 7) &&
|
|
!get_sha1_hex(bufptr + 7, parent)) {
|
|
struct commit *new_parent = lookup_commit(parent);
|
|
if (new_parent) {
|
|
commit_list_insert(new_parent, &item->parents);
|
|
add_ref(&item->object, &new_parent->object);
|
|
}
|
|
bufptr += 48;
|
|
}
|
|
item->date = parse_commit_date(bufptr);
|
|
free(buffer);
|
|
return 0;
|
|
}
|
|
|
|
void commit_list_insert(struct commit *item, struct commit_list **list_p)
|
|
{
|
|
struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
|
|
new_list->item = item;
|
|
new_list->next = *list_p;
|
|
*list_p = new_list;
|
|
}
|
|
|
|
void free_commit_list(struct commit_list *list)
|
|
{
|
|
while (list) {
|
|
struct commit_list *temp = list;
|
|
list = temp->next;
|
|
free(temp);
|
|
}
|
|
}
|
|
|
|
static void insert_by_date(struct commit_list **list, struct commit *item)
|
|
{
|
|
struct commit_list **pp = list;
|
|
struct commit_list *p;
|
|
while ((p = *pp) != NULL) {
|
|
if (p->item->date < item->date) {
|
|
break;
|
|
}
|
|
pp = &p->next;
|
|
}
|
|
commit_list_insert(item, pp);
|
|
}
|
|
|
|
|
|
void sort_by_date(struct commit_list **list)
|
|
{
|
|
struct commit_list *ret = NULL;
|
|
while (*list) {
|
|
insert_by_date(&ret, (*list)->item);
|
|
*list = (*list)->next;
|
|
}
|
|
*list = ret;
|
|
}
|
|
|
|
struct commit *pop_most_recent_commit(struct commit_list **list,
|
|
unsigned int mark)
|
|
{
|
|
struct commit *ret = (*list)->item;
|
|
struct commit_list *parents = ret->parents;
|
|
struct commit_list *old = *list;
|
|
|
|
*list = (*list)->next;
|
|
free(old);
|
|
|
|
while (parents) {
|
|
struct commit *commit = parents->item;
|
|
parse_commit(commit);
|
|
if (!(commit->object.flags & mark)) {
|
|
commit->object.flags |= mark;
|
|
insert_by_date(list, commit);
|
|
}
|
|
parents = parents->next;
|
|
}
|
|
return ret;
|
|
}
|