diff options
author | Eric Wong <normalperson@yhbt.net> | 2012-01-04 17:59:15 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2012-01-08 19:01:49 (JST) |
commit | 19c31231fac828bb336db67b8cccc871bea1500e (patch) | |
tree | 5f299037ea3db3eac1cea40892a7b2048a979ccc | |
parent | 94b7c76e531315b245f79a9e2dfd0655e6e45fee (diff) | |
download | cgit-19c31231fac828bb336db67b8cccc871bea1500e.zip cgit-19c31231fac828bb336db67b8cccc871bea1500e.tar.gz |
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.c | 6 |
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) | |||
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(); |