Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Sun, 18 Mar 2012 10:10:10 +0000
2 files changed,
5 insertions(+),
7 deletions(-)
M
ui-ssdiff.c
→
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();