3 files changed, 16 insertions, 3 deletions

diff --git a/source/ui-blob.c b/source/ui-blob.cindex e1503e0..4690bb5 100644--- a/source/ui-blob.c+++ b/source/ui-blob.c@@ -133,7 +133,7 @@ int cgit_print_file(char *path, const char *head, int file_only, int html_escape 	if (type == OBJ_BAD) 		return -1; 	if (cgit_blob_too_large(size))-		return -1;+		return -2; 	buf = odb_read_object(the_repository->objects, &oid, &type, &size); 	if (!buf) 		return -1;
diff --git a/source/ui-blob.c b/source/ui-blob.c
index e1503e0..4690bb5 100644
--- a/source/ui-blob.c
+++ b/source/ui-blob.c
@@ -133,7 +133,7 @@ int cgit_print_file(char *path, const char *head, int file_only, int html_escape
 	if (type == OBJ_BAD)
 		return -1;
 	if (cgit_blob_too_large(size))
-		return -1;
+		return -2;
 	buf = odb_read_object(the_repository->objects, &oid, &type, &size);
 	if (!buf)
 		return -1;
diff --git a/source/ui-blob.h b/source/ui-blob.hindex 58e0abb..2c10c55 100644--- a/source/ui-blob.h+++ b/source/ui-blob.h@@ -9,7 +9,14 @@ #define CGIT_UI_BLOB_H  extern int cgit_ref_path_exists(const char *path, const char *ref, int file_only);++/*+ * Write the file at path in head, escaped when html_escape is set. The return+ * is 0 once it is written, -2 when it is past max-blob-size, and -1 when it+ * cannot be found or read.+ */ extern int cgit_print_file(char *path, const char *head, int file_only, int html_escape);+ extern void cgit_print_blob(const char *hex, char *path, const char *head, int file_only);  #endif // CGIT_UI_BLOB_H
diff --git a/source/ui-blob.h b/source/ui-blob.h
index 58e0abb..2c10c55 100644
--- a/source/ui-blob.h
+++ b/source/ui-blob.h
@@ -9,7 +9,14 @@
 #define CGIT_UI_BLOB_H
 
 extern int cgit_ref_path_exists(const char *path, const char *ref, int file_only);
+
+/*
+ * Write the file at path in head, escaped when html_escape is set. The return
+ * is 0 once it is written, -2 when it is past max-blob-size, and -1 when it
+ * cannot be found or read.
+ */
 extern int cgit_print_file(char *path, const char *head, int file_only, int html_escape);
+
 extern void cgit_print_blob(const char *hex, char *path, const char *head, int file_only);
 
 #endif // CGIT_UI_BLOB_H
diff --git a/source/ui-summary.c b/source/ui-summary.cindex 44abc6b..005263a 100644--- a/source/ui-summary.c+++ b/source/ui-summary.c@@ -71,6 +71,7 @@ void cgit_print_summary(void) void cgit_print_repo_readme(void) { 	char *filename, *ref;+	int err = 0;  	cgit_print_layout_start(); 	filename = ctx.repo->readme.items[0].string;@@ -82,7 +83,7 @@ void cgit_print_repo_readme(void) 		// into safe HTML, so it is escaped rather than served raw. 		html("<pre class='plaintext'>"); 		if (ref) {-			cgit_print_file(filename, ref, 1, 1);+			err = cgit_print_file(filename, ref, 1, 1); 		} else { 			struct strbuf sb = STRBUF_INIT; 			if (strbuf_read_file(&sb, filename, 0) >= 0)@@ -101,7 +102,7 @@ void cgit_print_repo_readme(void) 		// through unescaped. 		cgit_open_filter(ctx.repo->about_filter, filename, tree_base.buf, tree_query.buf); 		if (ref)-			cgit_print_file(filename, ref, 1, 0);+			err = cgit_print_file(filename, ref, 1, 0); 		else 			html_include(filename); 		cgit_close_filter(ctx.repo->about_filter);@@ -109,5 +110,10 @@ void cgit_print_repo_readme(void) 		strbuf_release(&tree_query); 	} 	html("</div>");+	// A readme past max-blob-size is never read, which would otherwise+	// leave the about page with nothing on it.+	if (err == -2)+		cgit_print_error_page(413, "Content Too Large", "The readme is larger than max-blob-size (%d KB)",+			ctx.cfg.max_blob_size); 	cgit_print_layout_end(); }
diff --git a/source/ui-summary.c b/source/ui-summary.c
index 44abc6b..005263a 100644
--- a/source/ui-summary.c
+++ b/source/ui-summary.c
@@ -71,6 +71,7 @@ void cgit_print_summary(void)
 void cgit_print_repo_readme(void)
 {
 	char *filename, *ref;
+	int err = 0;
 
 	cgit_print_layout_start();
 	filename = ctx.repo->readme.items[0].string;
@@ -82,7 +83,7 @@ void cgit_print_repo_readme(void)
 		// into safe HTML, so it is escaped rather than served raw.
 		html("<pre class='plaintext'>");
 		if (ref) {
-			cgit_print_file(filename, ref, 1, 1);
+			err = cgit_print_file(filename, ref, 1, 1);
 		} else {
 			struct strbuf sb = STRBUF_INIT;
 			if (strbuf_read_file(&sb, filename, 0) >= 0)
@@ -101,7 +102,7 @@ void cgit_print_repo_readme(void)
 		// through unescaped.
 		cgit_open_filter(ctx.repo->about_filter, filename, tree_base.buf, tree_query.buf);
 		if (ref)
-			cgit_print_file(filename, ref, 1, 0);
+			err = cgit_print_file(filename, ref, 1, 0);
 		else
 			html_include(filename);
 		cgit_close_filter(ctx.repo->about_filter);
@@ -109,5 +110,10 @@ void cgit_print_repo_readme(void)
 		strbuf_release(&tree_query);
 	}
 	html("</div>");
+	// A readme past max-blob-size is never read, which would otherwise
+	// leave the about page with nothing on it.
+	if (err == -2)
+		cgit_print_error_page(413, "Content Too Large", "The readme is larger than max-blob-size (%d KB)",
+			ctx.cfg.max_blob_size);
 	cgit_print_layout_end();
 }