Merge branch 'stable'

2 files changed, 25 insertions, 11 deletions

diff --git a/ui-snapshot.c b/ui-snapshot.c
index f25613e..5372f5d 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -143,46 +143,57 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
         if (prefixcmp(snapshot, reponame) == 0) {
                 snapshot += strlen(reponame);
                 while (snapshot && (*snapshot == '-' || *snapshot == '_'))
                         snapshot++;
         }
 
         if (get_sha1(snapshot, sha1) == 0)
                 return snapshot;
 
         snapshot = fmt("v%s", snapshot);
         if (get_sha1(snapshot, sha1) == 0)
                 return snapshot;
 
         return NULL;
 }
 
+void show_error(char *msg)
+{
+        ctx.page.mimetype = "text/html";
+        cgit_print_http_headers(&ctx);
+        cgit_print_docstart(&ctx);
+        cgit_print_pageheader(&ctx);
+        cgit_print_error(msg);
+        cgit_print_docend();
+}
+
 void cgit_print_snapshot(const char *head, const char *hex,
                          const char *filename, int snapshots, int dwim)
 {
         const struct cgit_snapshot_format* f;
         char *prefix = NULL;
 
+        if (!filename) {
+                show_error("No snapshot name specified");
+                return;
+        }
+
         f = get_format(filename);
         if (!f) {
-                ctx.page.mimetype = "text/html";
-                cgit_print_http_headers(&ctx);
-                cgit_print_docstart(&ctx);
-                cgit_print_pageheader(&ctx);
-                cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
-                cgit_print_docend();
+                show_error(xstrdup(fmt("Unsupported snapshot format: %s",
+                                       filename)));
                 return;
         }
 
         if (!hex && dwim) {
                 hex = get_ref_from_filename(ctx.repo->url, filename, f);
                 if (hex == NULL) {
                         html_status(404, "Not found", 0);
                         return;
                 }
                 prefix = xstrdup(filename);
                 prefix[strlen(filename) - strlen(f->suffix)] = '\0';
         }
 
         if (!hex)
                 hex = head;
 
diff --git a/ui-tree.c b/ui-tree.c
index c6159ec..553dbaa 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -12,37 +12,40 @@
 #include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int header = 0;
 
 static void print_text_buffer(char *buf, unsigned long size)
 {
         unsigned long lineno, idx;
         const char *numberfmt =
                 "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
 
         html("<table summary='blob content' class='blob'>\n");
         html("<tr><td class='linenumbers'><pre>");
         idx = 0;
         lineno = 0;
-        htmlf(numberfmt, ++lineno);
-        while(idx < size - 1) { // skip absolute last newline
-                if (buf[idx] == '\n')
-                        htmlf(numberfmt, ++lineno);
-                idx++;
+
+        if (size) {
+                htmlf(numberfmt, ++lineno);
+                while(idx < size - 1) { // skip absolute last newline
+                        if (buf[idx] == '\n')
+                                htmlf(numberfmt, ++lineno);
+                        idx++;
+                }
         }
         html("</pre></td>\n");
         html("<td class='lines'><pre><code>");
         html_txt(buf);
         html("</code></pre></td></tr></table>\n");
 }
 
 #define ROWLEN 32
 
 static void print_binary_buffer(char *buf, unsigned long size)
 {
         unsigned long ofs, idx;
         static char ascii[ROWLEN + 1];
 
         html("<table summary='blob content' class='bin-blob'>\n");
         html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");