about summary refs log tree commit diff
path: root/third_party/cgit/ui-blame.c
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-02-21T21·05+0000
committerVincent Ambo <tazjin@google.com>2020-02-21T21·05+0000
commitd657e878fa518cd0489ee6352261bf17185c3fe4 (patch)
treefd869264f84f327080b10788f36ab75bb5e9b113 /third_party/cgit/ui-blame.c
parent68d1d87a9b2fbccf866230a3d2c95ae0771c82e5 (diff)
parentcd8a9f7b27ec43ce7a809e86a2d26236ccf1bb41 (diff)
merge: Add june's cgit patches to //third_party/cgit r/568
june maintains some patches on https://git.causal.agency/cgit/log/
that seem sensible to include in this tree.
Diffstat (limited to 'third_party/cgit/ui-blame.c')
-rw-r--r--third_party/cgit/ui-blame.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/cgit/ui-blame.c b/third_party/cgit/ui-blame.c
index 45fe191344..886c4c19fd 100644
--- a/third_party/cgit/ui-blame.c
+++ b/third_party/cgit/ui-blame.c
@@ -151,6 +151,10 @@ static void print_object(const struct object_id *oid, const char *path,
 	cgit_tree_link("tree", NULL, NULL, ctx.qry.head, rev, path);
 	html(")\n");
 
+	if (buffer_is_binary(buf, size)) {
+		html("<div class='error'>blob is binary.</div>");
+		goto cleanup;
+	}
 	if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
 		htmlf("<div class='error'>blob size (%ldKB)"
 		      " exceeds display size limit (%dKB).</div>",