{"thread":{"id":"43452","subject":"[PATCH 3/4] xdl_merge(): fix an off-by-one bug","startedAt":"2006-11-29T23:24:32Z","lastAt":"2006-11-29T23:24:32Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"294850","messageId":"Pine.LNX.4.63.0611300024100.30004@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43452","inReplyTo":null,"subject":"[PATCH 3/4] xdl_merge(): fix an off-by-one bug","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-11-29T23:24:32Z","receivedAt":"2006-11-29T23:24:32Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nThe line range is i1 .. (i1 + chg1 - 1), not i1 .. (i1 + chg1).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n xdiff/xmerge.c |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/xdiff/xmerge.c b/xdiff/xmerge.c\nindex 6b6fbb8..9fe2059 100644\n--- a/xdiff/xmerge.c\n+++ b/xdiff/xmerge.c\n@@ -194,11 +194,11 @@ static int xdl_refine_conflicts(xdfenv_t\n \t\t * we have a very simple mmfile structure.\n \t\t */\n \t\tt1.ptr = (char *)xe1->xdf2.recs[m->i1]->ptr;\n-\t\tt1.size = xe1->xdf2.recs[m->i1 + m->chg1]->ptr\n-\t\t\t+ xe1->xdf2.recs[m->i1 + m->chg1]->size - t1.ptr;\n-\t\tt2.ptr = (char *)xe2->xdf2.recs[m->i1]->ptr;\n-\t\tt2.size = xe2->xdf2.recs[m->i1 + m->chg1]->ptr\n-\t\t\t+ xe2->xdf2.recs[m->i1 + m->chg1]->size - t2.ptr;\n+\t\tt1.size = xe1->xdf2.recs[m->i1 + m->chg1 - 1]->ptr\n+\t\t\t+ xe1->xdf2.recs[m->i1 + m->chg1 - 1]->size - t1.ptr;\n+\t\tt2.ptr = (char *)xe2->xdf2.recs[m->i2]->ptr;\n+\t\tt2.size = xe2->xdf2.recs[m->i2 + m->chg2 - 1]->ptr\n+\t\t\t+ xe2->xdf2.recs[m->i2 + m->chg2 - 1]->size - t2.ptr;\n \t\tif (xdl_do_diff(&t1, &t2, xpp, &xe) < 0)\n \t\t\treturn -1;\n \t\tif (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 ||\n-- \n1.4.4.g5aac-dirty\n"}]}