about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ui-shared.c4
-rw-r--r--ui-ssdiff.c8
2 files changed, 5 insertions, 7 deletions
diff --git a/ui-shared.c b/ui-shared.c index 3e9282f..d7d75bf 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -294,7 +294,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
294 char *delim; 294 char *delim;
295 295
296 delim = repolink(title, class, "log", head, path); 296 delim = repolink(title, class, "log", head, path);
297 if (rev && strcmp(rev, ctx.qry.head)) { 297 if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
298 html(delim); 298 html(delim);
299 html("id="); 299 html("id=");
300 html_url_arg(rev); 300 html_url_arg(rev);
@@ -338,7 +338,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
338 char *delim; 338 char *delim;
339 339
340 delim = repolink(title, class, "commit", head, path); 340 delim = repolink(title, class, "commit", head, path);
341 if (rev && strcmp(rev, ctx.qry.head)) { 341 if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
342 html(delim); 342 html(delim);
343 html("id="); 343 html("id=");
344 html_url_arg(rev); 344 html_url_arg(rev);
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 9fb5b11..0cff4b8 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c
@@ -23,7 +23,7 @@ static void create_or_reset_lcs_table()
23 int i; 23 int i;
24 24
25 if (L != NULL) { 25 if (L != NULL) {
26 memset(*L, 0, sizeof(*L) * MAX_SSDIFF_SIZE); 26 memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE);
27 return; 27 return;
28 } 28 }
29 29
@@ -42,14 +42,12 @@ static char *longest_common_subsequence(char *A, char *B)
42 int i, j, ri; 42 int i, j, ri;
43 int m = strlen(A); 43 int m = strlen(A);
44 int n = strlen(B); 44 int n = strlen(B);
45 int tmp1, tmp2, length; 45 int tmp1, tmp2;
46 int lcs_length; 46 int lcs_length;
47 char *result; 47 char *result;
48 48
49 length = (m + 1) * (n + 1);
50
51 // We bail if the lines are too long 49 // We bail if the lines are too long
52 if (length > MAX_SSDIFF_SIZE) 50 if (m >= MAX_SSDIFF_M || n >= MAX_SSDIFF_N)
53 return NULL; 51 return NULL;
54 52
55 create_or_reset_lcs_table(); 53 create_or_reset_lcs_table();