summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2012-01-04 08:59:15 (GMT)
committerLars Hjemli <hjemli@gmail.com>2012-01-08 10:01:49 (GMT)
commit19c31231fac828bb336db67b8cccc871bea1500e (patch)
tree5f299037ea3db3eac1cea40892a7b2048a979ccc
parent94b7c76e531315b245f79a9e2dfd0655e6e45fee (diff)
downloadcgit-19c31231fac828bb336db67b8cccc871bea1500e.zip
cgit-19c31231fac828bb336db67b8cccc871bea1500e.tar.gz
cgit-19c31231fac828bb336db67b8cccc871bea1500e.tar.bz2
ui-ssdiff.c: correct length check for LCS table
Each individual string may be too long for its respective dimension of the LCS table. Signed-off-by: Eric Wong <normalperson@yhbt.net>
-rw-r--r--ui-ssdiff.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 9fb5b11..45770b1 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -42,14 +42,12 @@ static char *longest_common_subsequence(char *A, char *B)
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();