projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more memory leak avoidance
[git.git]
/
tag.c
diff --git
a/tag.c
b/tag.c
index
b1ab75f
..
9191333
100644
(file)
--- a/
tag.c
+++ b/
tag.c
@@
-1,12
+1,17
@@
-#include "tag.h"
#include "cache.h"
#include "cache.h"
+#include "tag.h"
const char *tag_type = "tag";
const char *tag_type = "tag";
-struct object *deref_tag(struct object *o)
+struct object *deref_tag(struct object *o
, const char *warn, int warnlen
)
{
{
- while (o && o->type ==
tag_type
)
+ while (o && o->type ==
TYPE_TAG
)
o = parse_object(((struct tag *)o)->tagged->sha1);
o = parse_object(((struct tag *)o)->tagged->sha1);
+ if (!o && warn) {
+ if (!warnlen)
+ warnlen = strlen(warn);
+ error("missing object referenced by '%.*s'", warnlen, warn);
+ }
return o;
}
return o;
}
@@
-14,17
+19,16
@@
struct tag *lookup_tag(const unsigned char *sha1)
{
struct object *obj = lookup_object(sha1);
if (!obj) {
{
struct object *obj = lookup_object(sha1);
if (!obj) {
- struct tag *ret = xmalloc(sizeof(struct tag));
- memset(ret, 0, sizeof(struct tag));
+ struct tag *ret = xcalloc(1, sizeof(struct tag));
created_object(sha1, &ret->object);
created_object(sha1, &ret->object);
- ret->object.type =
tag_type
;
+ ret->object.type =
TYPE_TAG
;
return ret;
}
if (!obj->type)
return ret;
}
if (!obj->type)
- obj->type =
tag_type
;
- if (obj->type !=
tag_type
) {
- error("Object %s is a %s, not a tree",
- sha1_to_hex(sha1),
obj->type
);
+ obj->type =
TYPE_TAG
;
+ if (obj->type !=
TYPE_TAG
) {
+ error("Object %s is a %s, not a tree",
+ sha1_to_hex(sha1),
typename(obj->type)
);
return NULL;
}
return (struct tag *) obj;
return NULL;
}
return (struct tag *) obj;
@@
-70,8
+74,11
@@
int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
item->tag[taglen] = '\0';
item->tagged = lookup_object_type(object, type);
item->tag[taglen] = '\0';
item->tagged = lookup_object_type(object, type);
- if (item->tagged)
- add_ref(&item->object, item->tagged);
+ if (item->tagged && track_object_refs) {
+ struct object_refs *refs = alloc_object_refs(1);
+ refs->ref[0] = item->tagged;
+ set_object_refs(&item->object, refs);
+ }
return 0;
}
return 0;
}