revision.c: fix "dense" under --remove-empty

diff --git a/commit.c b/commit.c
index 94f470b75cfc68bfd8e14d1e421e19c5ad6004d6..e51ffa1c6cf5948c0e6c6d0b905fc868f4464ccf 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -56,10 +56,10 @@ static struct commit *check_commit(struct object *obj,
                                   const unsigned char *sha1,
                                   int quiet)
 {
-       if (obj->type != commit_type) {
+       if (obj->type != TYPE_COMMIT) {
                if (!quiet)
                        error("Object %s is a %s, not a commit",
-                             sha1_to_hex(sha1), obj->type);
+                             sha1_to_hex(sha1), typename(obj->type));
                return NULL;
        }
        return (struct commit *) obj;
@@ -84,13 +84,13 @@ struct commit *lookup_commit(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               struct commit *ret = xcalloc(1, sizeof(struct commit));
+               struct commit *ret = alloc_commit_node();
                created_object(sha1, &ret->object);
-               ret->object.type = commit_type;
+               ret->object.type = TYPE_COMMIT;
                return ret;
        }
        if (!obj->type)
-               obj->type = commit_type;
+               obj->type = TYPE_COMMIT;
        return check_commit(obj, sha1, 0);
 }
 
@@ -236,6 +236,7 @@ static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
 
 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 {
+       char *tail = buffer;
        char *bufptr = buffer;
        unsigned char parent[20];
        struct commit_list **pptr;
@@ -245,9 +246,10 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
        if (item->object.parsed)
                return 0;
        item->object.parsed = 1;
-       if (memcmp(bufptr, "tree ", 5))
+       tail += size;
+       if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
                return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
-       if (get_sha1_hex(bufptr + 5, parent) < 0)
+       if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
                return error("bad tree pointer in commit %s",
                             sha1_to_hex(item->object.sha1));
        item->tree = lookup_tree(parent);
@@ -257,10 +259,12 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
        pptr = &item->parents;
 
        graft = lookup_commit_graft(item->object.sha1);
-       while (!memcmp(bufptr, "parent ", 7)) {
+       while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
                struct commit *new_parent;
 
-               if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
+               if (tail <= bufptr + 48 ||
+                   get_sha1_hex(bufptr + 7, parent) ||
+                   bufptr[47] != '\n')
                        return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
                bufptr += 48;
                if (graft)
@@ -447,7 +451,7 @@ static int add_rfc2047(char *buf, const char *line, int len)
        memcpy(bp, q_utf8, sizeof(q_utf8)-1);
        bp += sizeof(q_utf8)-1;
        for (i = 0; i < len; i++) {
-               unsigned ch = line[i];
+               unsigned ch = line[i] & 0xFF;
                if (is_rfc2047_special(ch)) {
                        sprintf(bp, "=%02X", ch);
                        bp += 3;
@@ -543,7 +547,7 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
                const char *hex = abbrev
                        ? find_unique_abbrev(p->object.sha1, abbrev)
                        : sha1_to_hex(p->object.sha1);
-               char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
+               const char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
                parent = parent->next;
 
                offset += sprintf(buf + offset, " %s%s", hex, dots);
@@ -571,10 +575,23 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
         * to say this is not a 7-bit ASCII.
         */
        if (fmt == CMIT_FMT_EMAIL && !after_subject) {
-               int i;
-               for (i = 0; !plain_non_ascii && msg[i] && i < len; i++)
-                       if (msg[i] & 0x80)
+               int i, ch, in_body;
+
+               for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
+                       if (!in_body) {
+                               /* author could be non 7-bit ASCII but
+                                * the log may so; skip over the
+                                * header part first.
+                                */
+                               if (ch == '\n' &&
+                                   i + 1 < len && msg[i+1] == '\n')
+                                       in_body = 1;
+                       }
+                       else if (ch & 0x80) {
                                plain_non_ascii = 1;
+                               break;
+                       }
+               }
        }
 
        for (;;) {
@@ -711,12 +728,12 @@ int count_parents(struct commit * commit)
 
 void topo_sort_default_setter(struct commit *c, void *data)
 {
-       c->object.util = data;
+       c->util = data;
 }
 
 void *topo_sort_default_getter(struct commit *c)
 {
-       return c->object.util;
+       return c->util;
 }
 
 /*