all repos — cgit @ 961893b5478e7676b1a422185fcac41f89434b0a

a hyperfast web frontend for git written in c

Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Sun, 18 Mar 2012 10:10:10 +0000
commit

961893b5478e7676b1a422185fcac41f89434b0a

parent

1de3048d08fc6491630c45437f88f5ab03c0508f

2 files changed, 5 insertions(+), 7 deletions(-)

jump to
M ui-shared.cui-shared.c

@@ -294,7 +294,7 @@ {

char *delim; delim = repolink(title, class, "log", head, path); - if (rev && strcmp(rev, ctx.qry.head)) { + if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) { html(delim); html("id="); html_url_arg(rev);

@@ -338,7 +338,7 @@

char *delim; delim = repolink(title, class, "commit", head, path); - if (rev && strcmp(rev, ctx.qry.head)) { + if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) { html(delim); html("id="); html_url_arg(rev);
M ui-ssdiff.cui-ssdiff.c

@@ -23,7 +23,7 @@ {

int i; if (L != NULL) { - memset(*L, 0, sizeof(*L) * MAX_SSDIFF_SIZE); + memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE); return; }

@@ -42,14 +42,12 @@ {

int i, j, ri; int m = strlen(A); int n = strlen(B); - int tmp1, tmp2, length; + int tmp1, tmp2; int lcs_length; char *result; - length = (m + 1) * (n + 1); - // We bail if the lines are too long - if (length > MAX_SSDIFF_SIZE) + if (m >= MAX_SSDIFF_M || n >= MAX_SSDIFF_N) return NULL; create_or_reset_lcs_table();