Browse Source

Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  fix memory leak in parse_object when check_sha1_signature fails
  name-rev: tolerate clock skew in committer dates
maint
Junio C Hamano 18 years ago
parent
commit
76026200ee
  1. 4
      builtin-name-rev.c
  2. 1
      object.c

4
builtin-name-rev.c

@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
#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";

@ -208,6 +210,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) @@ -208,6 +210,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
add_object_array((struct object *)commit, *argv, &revs);
}

if (cutoff)
cutoff = cutoff - CUTOFF_DATE_SLOP;
for_each_ref(name_ref, &data);

if (transform_stdin) {

1
object.c

@ -176,6 +176,7 @@ struct object *parse_object(const unsigned char *sha1) @@ -176,6 +176,7 @@ struct object *parse_object(const unsigned char *sha1)
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;
}

Loading…
Cancel
Save