cgit

commit 961893b5478e7676b1a422185fcac41f89434b0a

Author: Lars Hjemli <hjemli@gmail.com>

Merge branch 'stable'

 ui-shared.c | 4 ++--
 ui-ssdiff.c | 8 +++-----


diff --git a/ui-shared.c b/ui-shared.c
index 3e9282f35c0e032251b26ab00bd7f35e3bb7aee0..d7d75bf0cf56b8581fb382b7ee2f996e38a32758 100644
--- a/ui-shared.c
+++ b/ui-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);




diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 9fb5b1139af12c05d9817d9fcef884b843d928ca..0cff4b82ed46c8bc41e07c1392dd9c8e9e3ff75a 100644
--- a/ui-ssdiff.c
+++ b/ui-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();