author | Junio C Hamano <junkio@cox.net> | |
Fri, 25 May 2007 02:01:50 +0000 (19:01 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 25 May 2007 02:01:50 +0000 (19:01 -0700) |
* maint-1.5.1:
fix memory leak in parse_object when check_sha1_signature fails
name-rev: tolerate clock skew in committer dates
fix memory leak in parse_object when check_sha1_signature fails
name-rev: tolerate clock skew in committer dates
builtin-name-rev.c | patch | blob | history | |
object.c | patch | blob | history |
diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index ef1638590722017ad2cacca7ce30098fd0392bd5..2d94eaaa6a90f2efe4401873930533b12b85522f 100644 (file)
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
#include "tag.h"
#include "refs.h"
+#define CUTOFF_DATE_SLOP 86400 /* one day */
+
static const char name_rev_usage[] =
"git-name-rev [--tags | --refs=<pattern>] ( --all | --stdin | committish [committish...] )\n";
add_object_array((struct object *)commit, *argv, &revs);
}
+ if (cutoff)
+ cutoff = cutoff - CUTOFF_DATE_SLOP;
for_each_ref(name_ref, &data);
if (transform_stdin) {
diff --git a/object.c b/object.c
index 37d1363359eb54070ed4dc52b9e96d4ad9457db3..cfc4969ed9ba0ccfdba8f97637bac20be31d1eba 100644 (file)
--- a/object.c
+++ b/object.c
if (buffer) {
struct object *obj;
if (check_sha1_signature(sha1, buffer, size, typename(type)) < 0) {
+ free(buffer);
error("sha1 mismatch %s\n", sha1_to_hex(sha1));
return NULL;
}