List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] RFC: git: update to v2.19.0-rc0
@ 2018-08-21  7:21 list
  2018-08-21  8:46 ` john
  0 siblings, 1 reply; 4+ messages in thread
From: list @ 2018-08-21  7:21 UTC (permalink / raw)


From: Christian Hesse <mail at eworm.de>

Changelog to be writting... :)

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile      |  4 ++--
 cgit.h        |  1 +
 git           |  2 +-
 parsing.c     |  7 +++----
 shared.c      |  2 +-
 ui-blame.c    |  2 +-
 ui-blob.c     |  6 +++---
 ui-clone.c    |  4 ++--
 ui-commit.c   |  4 ++--
 ui-diff.c     |  4 ++--
 ui-log.c      |  4 ++--
 ui-patch.c    | 11 +++++++----
 ui-plain.c    |  2 +-
 ui-shared.c   |  6 +++---
 ui-snapshot.c |  4 ++--
 ui-ssdiff.c   |  9 +++++----
 ui-tag.c      |  4 ++--
 ui-tree.c     |  4 ++--
 18 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Makefile b/Makefile
index 05ea71f..d67c8c6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.18.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.19.0.rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/cgit.h b/cgit.h
index 32dfd7a..bcc4fce 100644
--- a/cgit.h
+++ b/cgit.h
@@ -8,6 +8,7 @@
 #include <cache.h>
 #include <grep.h>
 #include <object.h>
+#include <object-store.h>
 #include <tree.h>
 #include <commit.h>
 #include <tag.h>
diff --git a/git b/git
index 53f9a3e..7e8bfb0 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 53f9a3e157dbbc901a02ac2c73346d375e24978c
+Subproject commit 7e8bfb0412581daf8f3c89909f1d37844e8610dd
diff --git a/parsing.c b/parsing.c
index 12453c2..7b3980e 100644
--- a/parsing.c
+++ b/parsing.c
@@ -63,8 +63,7 @@ static char *substr(const char *head, const char *tail)
 	if (tail < head)
 		return xstrdup("");
 	buf = xmalloc(tail - head + 1);
-	strncpy(buf, head, tail - head);
-	buf[tail - head] = '\0';
+	strlcpy(buf, head, tail - head + 1);
 	return buf;
 }
 
@@ -78,7 +77,7 @@ static void parse_user(const char *t, char **name, char **email, unsigned long *
 
 		email_len = ident.mail_end - ident.mail_begin;
 		*email = xmalloc(strlen("<") + email_len + strlen(">") + 1);
-		sprintf(*email, "<%.*s>", email_len, ident.mail_begin);
+		xsnprintf(*email, email_len + 3, "<%.*s>", email_len, ident.mail_begin);
 
 		if (ident.date_begin)
 			*date = strtoul(ident.date_begin, NULL, 10);
@@ -130,7 +129,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 	const int sha1hex_len = 40;
 	struct commitinfo *ret;
-	const char *p = get_cached_commit_buffer(commit, NULL);
+	const char *p = get_cached_commit_buffer(the_repository, commit, NULL);
 	const char *t;
 
 	ret = xcalloc(1, sizeof(struct commitinfo));
diff --git a/shared.c b/shared.c
index 609bd2a..7560f5f 100644
--- a/shared.c
+++ b/shared.c
@@ -161,7 +161,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
 
 	ref = xmalloc(sizeof (struct refinfo));
 	ref->refname = xstrdup(refname);
-	ref->object = parse_object(oid);
+	ref->object = parse_object(the_repository, oid);
 	switch (ref->object->type) {
 	case OBJ_TAG:
 		ref->tag = cgit_parse_tag((struct tag *)ref->object);
diff --git a/ui-blame.c b/ui-blame.c
index 50d0580..6dc555f 100644
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -278,7 +278,7 @@ void cgit_print_blame(void)
 			"Invalid revision name: %s", rev);
 		return;
 	}
-	commit = lookup_commit_reference(&oid);
+	commit = lookup_commit_reference(the_repository, &oid);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error_page(404, "Not found",
 			"Invalid commit reference: %s", rev);
diff --git a/ui-blob.c b/ui-blob.c
index 7b6da2a..4b6b462 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -56,7 +56,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
 		goto done;
 	if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
 		goto done;
-	read_tree_recursive(lookup_commit_reference(&oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+	read_tree_recursive(lookup_commit_reference(the_repository, &oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
 
 done:
 	free(path_items.match);
@@ -89,7 +89,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
 		return -1;
 	type = oid_object_info(the_repository, &oid, &size);
 	if (type == OBJ_COMMIT) {
-		commit = lookup_commit_reference(&oid);
+		commit = lookup_commit_reference(the_repository, &oid);
 		read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
 		if (!walk_tree_ctx.found_path)
 			return -1;
@@ -145,7 +145,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
 	type = oid_object_info(the_repository, &oid, &size);
 
 	if ((!hex) && type == OBJ_COMMIT && path) {
-		commit = lookup_commit_reference(&oid);
+		commit = lookup_commit_reference(the_repository, &oid);
 		read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
 		type = oid_object_info(the_repository, &oid, &size);
 	}
diff --git a/ui-clone.c b/ui-clone.c
index 6ba8f36..5dccb63 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -19,12 +19,12 @@ static int print_ref_info(const char *refname, const struct object_id *oid,
 {
 	struct object *obj;
 
-	if (!(obj = parse_object(oid)))
+	if (!(obj = parse_object(the_repository, oid)))
 		return 0;
 
 	htmlf("%s\t%s\n", oid_to_hex(oid), refname);
 	if (obj->type == OBJ_TAG) {
-		if (!(obj = deref_tag(obj, refname, 0)))
+		if (!(obj = deref_tag(the_repository, obj, refname, 0)))
 			return 0;
 		htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), refname);
 	}
diff --git a/ui-commit.c b/ui-commit.c
index 995cb93..9a47b54 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -31,7 +31,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 				"Bad object id: %s", hex);
 		return;
 	}
-	commit = lookup_commit_reference(&oid);
+	commit = lookup_commit_reference(the_repository, &oid);
 	if (!commit) {
 		cgit_print_error_page(404, "Not found",
 				"Bad commit reference: %s", hex);
@@ -87,7 +87,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 	free(tmp);
 	html("</td></tr>\n");
 	for (p = commit->parents; p; p = p->next) {
-		parent = lookup_commit_reference(&p->item->object.oid);
+		parent = lookup_commit_reference(the_repository, &p->item->object.oid);
 		if (!parent) {
 			html("<tr><td colspan='3'>");
 			cgit_print_error("Error reading parent commit");
diff --git a/ui-diff.c b/ui-diff.c
index e33e9fb..70dcc91 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -407,7 +407,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
 			"Bad object name: %s", new_rev);
 		return;
 	}
-	commit = lookup_commit_reference(new_rev_oid);
+	commit = lookup_commit_reference(the_repository, new_rev_oid);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error_page(404, "Not found",
 			"Bad commit: %s", oid_to_hex(new_rev_oid));
@@ -428,7 +428,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
 	}
 
 	if (!is_null_oid(old_rev_oid)) {
-		commit2 = lookup_commit_reference(old_rev_oid);
+		commit2 = lookup_commit_reference(the_repository, old_rev_oid);
 		if (!commit2 || parse_commit(commit2)) {
 			cgit_print_error_page(404, "Not found",
 				"Bad commit: %s", oid_to_hex(old_rev_oid));
diff --git a/ui-log.c b/ui-log.c
index d696e20..3bcb657 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -67,7 +67,7 @@ void show_commit_decorations(struct commit *commit)
 	while (deco) {
 		struct object_id peeled;
 		int is_annotated = 0;
-		strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
+		strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
 		switch(deco->type) {
 		case DECORATION_NONE:
 			/* If the git-core doesn't recognize it,
@@ -234,7 +234,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 			strbuf_add(&msgbuf, "\n\n", 2);
 
 			/* Place wrap_symbol at position i in info->subject */
-			strcpy(info->subject + i, wrap_symbol);
+			strlcpy(info->subject + i, wrap_symbol, subject_len - i + 1);
 		}
 	}
 	cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
diff --git a/ui-patch.c b/ui-patch.c
index 8007a11..efd7a34 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -11,13 +11,16 @@
 #include "html.h"
 #include "ui-shared.h"
 
+/* two SHA1 hashes with two dots in between and termination */
+#define REV_RANGE_LEN 2 * 40 + 3
+
 void cgit_print_patch(const char *new_rev, const char *old_rev,
 		      const char *prefix)
 {
 	struct rev_info rev;
 	struct commit *commit;
 	struct object_id new_rev_oid, old_rev_oid;
-	char rev_range[2 * 40 + 3];
+	char rev_range[REV_RANGE_LEN];
 	const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
 	int rev_argc = ARRAY_SIZE(rev_argv) - 1;
 	char *patchname;
@@ -33,7 +36,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 				"Bad object id: %s", new_rev);
 		return;
 	}
-	commit = lookup_commit_reference(&new_rev_oid);
+	commit = lookup_commit_reference(the_repository, &new_rev_oid);
 	if (!commit) {
 		cgit_print_error_page(404, "Not found",
 				"Bad commit reference: %s", new_rev);
@@ -46,7 +49,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 					"Bad object id: %s", old_rev);
 			return;
 		}
-		if (!lookup_commit_reference(&old_rev_oid)) {
+		if (!lookup_commit_reference(the_repository, &old_rev_oid)) {
 			cgit_print_error_page(404, "Not found",
 					"Bad commit reference: %s", old_rev);
 			return;
@@ -60,7 +63,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 	if (is_null_oid(&old_rev_oid)) {
 		memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
 	} else {
-		sprintf(rev_range, "%s..%s", oid_to_hex(&old_rev_oid),
+		xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
 			oid_to_hex(&new_rev_oid));
 	}
 
diff --git a/ui-plain.c b/ui-plain.c
index ddb3e48..070c34b 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -185,7 +185,7 @@ void cgit_print_plain(void)
 		cgit_print_error_page(404, "Not found", "Not found");
 		return;
 	}
-	commit = lookup_commit_reference(&oid);
+	commit = lookup_commit_reference(the_repository, &oid);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error_page(404, "Not found", "Not found");
 		return;
diff --git a/ui-shared.c b/ui-shared.c
index 739505a..f8b438b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1176,14 +1176,14 @@ void cgit_set_title_from_path(const char *path)
 				continue;
 			}
 			strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
-			strcat(new_title, "\\");
+			strncat(new_title, "\\", 2);
 			path_last_end = path_index;
 		}
 	}
 	if (path_last_end)
 		strncat(new_title, path, path_last_end);
 
-	strcat(new_title, " - ");
-	strcat(new_title, ctx.page.title);
+	strncat(new_title, " - ", 4);
+	strncat(new_title, ctx.page.title, sizeof(new_title) - strlen(new_title));
 	ctx.page.title = new_title;
 }
diff --git a/ui-snapshot.c b/ui-snapshot.c
index fa3ceaf..85efe64 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
 	/* argv_array guarantees a trailing NULL entry. */
 	memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
-	result = write_archive(argv.argc, nargv, NULL, NULL, 0);
+	result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0);
 	argv_array_clear(&argv);
 	free(nargv);
 	return result;
@@ -147,7 +147,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
 				"Bad object id: %s", hex);
 		return 1;
 	}
-	if (!lookup_commit_reference(&oid)) {
+	if (!lookup_commit_reference(the_repository, &oid)) {
 		cgit_print_error_page(400, "Bad request",
 				"Not a commit reference: %s", hex);
 		return 1;
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 68c2044..ea9825d 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -103,8 +103,7 @@ static int line_from_hunk(char *line, char type)
 		return 0;
 	len = buf2 - buf1;
 	buf2 = xmalloc(len + 1);
-	strncpy(buf2, buf1, len);
-	buf2[len] = '\0';
+	strlcpy(buf2, buf1, len + 1);
 	res = atoi(buf2);
 	free(buf2);
 	return res;
@@ -118,6 +117,7 @@ static char *replace_tabs(char *line)
 	int n_tabs = 0;
 	int i;
 	char *result;
+	int result_len;
 
 	if (linelen == 0) {
 		result = xmalloc(1);
@@ -129,13 +129,14 @@ static char *replace_tabs(char *line)
 		if (line[i] == '\t')
 			n_tabs += 1;
 	}
-	result = xmalloc(linelen + n_tabs * 8 + 1);
+	result_len = linelen + n_tabs * 8 + 1;
+	result = xmalloc(result_len);
 	result[0] = '\0';
 
 	for (;;) {
 		cur_buf = strchr(prev_buf, '\t');
 		if (!cur_buf) {
-			strcat(result, prev_buf);
+			strncat(result, prev_buf, result_len);
 			break;
 		} else {
 			strncat(result, prev_buf, cur_buf - prev_buf);
diff --git a/ui-tag.c b/ui-tag.c
index 2c96c37..f530224 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -53,7 +53,7 @@ void cgit_print_tag(char *revname)
 			"Bad tag reference: %s", revname);
 		goto cleanup;
 	}
-	obj = parse_object(&oid);
+	obj = parse_object(the_repository, &oid);
 	if (!obj) {
 		cgit_print_error_page(500, "Internal server error",
 			"Bad object id: %s", oid_to_hex(&oid));
@@ -63,7 +63,7 @@ void cgit_print_tag(char *revname)
 		struct tag *tag;
 		struct taginfo *info;
 
-		tag = lookup_tag(&oid);
+		tag = lookup_tag(the_repository, &oid);
 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
 			cgit_print_error_page(500, "Internal server error",
 				"Bad tag object: %s", revname);
diff --git a/ui-tree.c b/ui-tree.c
index e6b3074..df8ad82 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -177,7 +177,7 @@ static void write_tree_link(const struct object_id *oid, char *name,
 		cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, rev,
 			       fullpath->buf);
 
-		tree = lookup_tree(&tree_ctx.oid);
+		tree = lookup_tree(the_repository, &tree_ctx.oid);
 		if (!tree)
 			return;
 
@@ -359,7 +359,7 @@ void cgit_print_tree(const char *rev, char *path)
 			"Invalid revision name: %s", rev);
 		return;
 	}
-	commit = lookup_commit_reference(&oid);
+	commit = lookup_commit_reference(the_repository, &oid);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error_page(404, "Not found",
 			"Invalid commit reference: %s", rev);


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/1] RFC: git: update to v2.19.0-rc0
  2018-08-21  7:21 [PATCH 1/1] RFC: git: update to v2.19.0-rc0 list
@ 2018-08-21  8:46 ` john
  2018-08-21  9:02   ` list
  2018-08-28 16:06   ` list
  0 siblings, 2 replies; 4+ messages in thread
From: john @ 2018-08-21  8:46 UTC (permalink / raw)


On Tue, Aug 21, 2018 at 09:21:14AM +0200, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
> 
> Changelog to be writting... :)

More comments below, but it looks like there's a lot of unrelated
cleanups here.  I think only the the_repository parameter addition is
required for Git 2.19.

The other changes mostly look good, but I think they can be split out
into a separate series (which can probably land before Git 2.19 final is
released).

> Signed-off-by: Christian Hesse <mail at eworm.de>
> ---
>  Makefile      |  4 ++--
>  cgit.h        |  1 +
>  git           |  2 +-
>  parsing.c     |  7 +++----
>  shared.c      |  2 +-
>  ui-blame.c    |  2 +-
>  ui-blob.c     |  6 +++---
>  ui-clone.c    |  4 ++--
>  ui-commit.c   |  4 ++--
>  ui-diff.c     |  4 ++--
>  ui-log.c      |  4 ++--
>  ui-patch.c    | 11 +++++++----
>  ui-plain.c    |  2 +-
>  ui-shared.c   |  6 +++---
>  ui-snapshot.c |  4 ++--
>  ui-ssdiff.c   |  9 +++++----
>  ui-tag.c      |  4 ++--
>  ui-tree.c     |  4 ++--
>  18 files changed, 42 insertions(+), 38 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 05ea71f..d67c8c6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,8 +14,8 @@ htmldir = $(docdir)
>  pdfdir = $(docdir)
>  mandir = $(prefix)/share/man
>  SHA1_HEADER = <openssl/sha.h>
> -GIT_VER = 2.18.0
> -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
> +GIT_VER = 2.19.0.rc0
> +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
>  INSTALL = install
>  COPYTREE = cp -r
>  MAN5_TXT = $(wildcard *.5.txt)
> diff --git a/cgit.h b/cgit.h
> index 32dfd7a..bcc4fce 100644
> --- a/cgit.h
> +++ b/cgit.h
> @@ -8,6 +8,7 @@
>  #include <cache.h>
>  #include <grep.h>
>  #include <object.h>
> +#include <object-store.h>
>  #include <tree.h>
>  #include <commit.h>
>  #include <tag.h>
> diff --git a/git b/git
> index 53f9a3e..7e8bfb0 160000
> --- a/git
> +++ b/git
> @@ -1 +1 @@
> -Subproject commit 53f9a3e157dbbc901a02ac2c73346d375e24978c
> +Subproject commit 7e8bfb0412581daf8f3c89909f1d37844e8610dd
> diff --git a/parsing.c b/parsing.c
> index 12453c2..7b3980e 100644
> --- a/parsing.c
> +++ b/parsing.c
> @@ -63,8 +63,7 @@ static char *substr(const char *head, const char *tail)
>  	if (tail < head)
>  		return xstrdup("");
>  	buf = xmalloc(tail - head + 1);
> -	strncpy(buf, head, tail - head);
> -	buf[tail - head] = '\0';
> +	strlcpy(buf, head, tail - head + 1);

Nice cleanup, but I don't think it is required for Git 2.19!

It's probably worth splitting this out for a separate patch that can
land before Git 2.19.

>  	return buf;
>  }
>  
> @@ -78,7 +77,7 @@ static void parse_user(const char *t, char **name, char **email, unsigned long *
>  
>  		email_len = ident.mail_end - ident.mail_begin;
>  		*email = xmalloc(strlen("<") + email_len + strlen(">") + 1);
> -		sprintf(*email, "<%.*s>", email_len, ident.mail_begin);
> +		xsnprintf(*email, email_len + 3, "<%.*s>", email_len, ident.mail_begin);

Again, not related to Git 2.19.  I'm not sure about this one, snprintf
isn't adding anything because we know exactly how big the buffer is.
However, I bet static analysis warns about sprintf here even though this
use is safe.

Maybe we should just use a strbuf?

>  
>  		if (ident.date_begin)
>  			*date = strtoul(ident.date_begin, NULL, 10);

[snip the_repository conversion that all looks good]

> diff --git a/ui-log.c b/ui-log.c
> index d696e20..3bcb657 100644
> --- a/ui-log.c
> +++ b/ui-log.c
> @@ -67,7 +67,7 @@ void show_commit_decorations(struct commit *commit)
>  	while (deco) {
>  		struct object_id peeled;
>  		int is_annotated = 0;
> -		strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
> +		strlcpy(buf, prettify_refname(deco->name), sizeof(buf));

More cleanup to split out.

>  		switch(deco->type) {
>  		case DECORATION_NONE:
>  			/* If the git-core doesn't recognize it,
> @@ -234,7 +234,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
>  			strbuf_add(&msgbuf, "\n\n", 2);
>  
>  			/* Place wrap_symbol at position i in info->subject */
> -			strcpy(info->subject + i, wrap_symbol);
> +			strlcpy(info->subject + i, wrap_symbol, subject_len - i + 1);

More cleanup.

>  		}
>  	}
>  	cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
> diff --git a/ui-patch.c b/ui-patch.c
> index 8007a11..efd7a34 100644
> --- a/ui-patch.c
> +++ b/ui-patch.c
> @@ -11,13 +11,16 @@
>  #include "html.h"
>  #include "ui-shared.h"
>  
> +/* two SHA1 hashes with two dots in between and termination */
> +#define REV_RANGE_LEN 2 * 40 + 3

Should this use GIT_MAX_HEXSZ ?

> +
>  void cgit_print_patch(const char *new_rev, const char *old_rev,
>  		      const char *prefix)
>  {
>  	struct rev_info rev;
>  	struct commit *commit;
>  	struct object_id new_rev_oid, old_rev_oid;
> -	char rev_range[2 * 40 + 3];
> +	char rev_range[REV_RANGE_LEN];
>  	const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
>  	int rev_argc = ARRAY_SIZE(rev_argv) - 1;
>  	char *patchname;

[snip more the_repository conversion.]

> @@ -60,7 +63,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
>  	if (is_null_oid(&old_rev_oid)) {
>  		memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
>  	} else {
> -		sprintf(rev_range, "%s..%s", oid_to_hex(&old_rev_oid),
> +		xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
>  			oid_to_hex(&new_rev_oid));
>  	}
>  
> diff --git a/ui-plain.c b/ui-plain.c
> index ddb3e48..070c34b 100644
> --- a/ui-plain.c
> +++ b/ui-plain.c
> @@ -185,7 +185,7 @@ void cgit_print_plain(void)
>  		cgit_print_error_page(404, "Not found", "Not found");
>  		return;
>  	}
> -	commit = lookup_commit_reference(&oid);
> +	commit = lookup_commit_reference(the_repository, &oid);
>  	if (!commit || parse_commit(commit)) {
>  		cgit_print_error_page(404, "Not found", "Not found");
>  		return;
> diff --git a/ui-shared.c b/ui-shared.c
> index 739505a..f8b438b 100644
> --- a/ui-shared.c
> +++ b/ui-shared.c
> @@ -1176,14 +1176,14 @@ void cgit_set_title_from_path(const char *path)
>  				continue;
>  			}
>  			strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
> -			strcat(new_title, "\\");
> +			strncat(new_title, "\\", 2);

Does this add anything?  (And I think n should be 1 here since "\\" is a
single character.)

>  			path_last_end = path_index;
>  		}
>  	}
>  	if (path_last_end)
>  		strncat(new_title, path, path_last_end);
>  
> -	strcat(new_title, " - ");
> -	strcat(new_title, ctx.page.title);
> +	strncat(new_title, " - ", 4);
> +	strncat(new_title, ctx.page.title, sizeof(new_title) - strlen(new_title));

n should be "sizeof(new_title) - strlen(new_title) - 1" here shouldn't
it?

>  	ctx.page.title = new_title;
>  }

[snip the rest]

I don't have any comments on the remainder of the patch that aren't just
repetitions of the above on more bits of code so I'm not going to type
them out :-)


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/1] RFC: git: update to v2.19.0-rc0
  2018-08-21  8:46 ` john
@ 2018-08-21  9:02   ` list
  2018-08-28 16:06   ` list
  1 sibling, 0 replies; 4+ messages in thread
From: list @ 2018-08-21  9:02 UTC (permalink / raw)


John Keeping <john at keeping.me.uk> on Tue, 2018/08/21 09:46:
> On Tue, Aug 21, 2018 at 09:21:14AM +0200, Christian Hesse wrote:
> > From: Christian Hesse <mail at eworm.de>
> > 
> > Changelog to be writting... :)  
> 
> More comments below, but it looks like there's a lot of unrelated
> cleanups here.  I think only the the_repository parameter addition is
> required for Git 2.19.
> 
> The other changes mostly look good, but I think they can be split out
> into a separate series (which can probably land before Git 2.19 final is
> released).

This is related to git 2.19, see "Merge branch 'jk/banned-function'" [0].
But you are right this can go in in separate patches if we do it before
git 2.19 final.

I will look at your comments. Thanks!

[0] https://github.com/git/git/commit/e28daf222f51f137d9038a58812f2a89f414781e
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20180821/7f5db86d/attachment-0001.asc>


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/1] RFC: git: update to v2.19.0-rc0
  2018-08-21  8:46 ` john
  2018-08-21  9:02   ` list
@ 2018-08-28 16:06   ` list
  1 sibling, 0 replies; 4+ messages in thread
From: list @ 2018-08-28 16:06 UTC (permalink / raw)


John Keeping <john at keeping.me.uk> on Tue, 2018/08/21 09:46:
> > diff --git a/ui-patch.c b/ui-patch.c
> > index 8007a11..efd7a34 100644
> > --- a/ui-patch.c
> > +++ b/ui-patch.c
> > @@ -11,13 +11,16 @@
> >  #include "html.h"
> >  #include "ui-shared.h"
> >  
> > +/* two SHA1 hashes with two dots in between and termination */
> > +#define REV_RANGE_LEN 2 * 40 + 3  
> 
> Should this use GIT_MAX_HEXSZ ?

Definitely. I've been looking for something with SHA1_*, but as sha1 is being
replaced... Thanks for the heads-up.
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20180828/2c02d450/attachment.asc>


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-08-28 16:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-21  7:21 [PATCH 1/1] RFC: git: update to v2.19.0-rc0 list
2018-08-21  8:46 ` john
2018-08-21  9:02   ` list
2018-08-28 16:06   ` list

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).