git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 4/4] xdiff: reduce the size of array

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
May 4, 2026, 14:06 UTC
Message-ID
<d7cb49a7c9987ea5526226ce45d8351b7fec5d31.1777903579.git.phillip.wood@dunelm.org.uk>
In-Reply-To
<cover.1777903579.git.phillip.wood@dunelm.org.uk>
From: Phillip Wood <phillip.wood@dunelm.org.uk>

When the myers algorithm is selected the input files are pre-processed to remove any common prefix and suffix and any lines that appear in only one file. This requires a map to be created between the lines that are processed by the myers algorithm and the lines in the original file. That map does not include the common lines at the beginning and end of the files but the array is allocated to be the size of the whole file. Move the allocation into xdl_cleanup_records() where the map is populated and we know how big it needs to be.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 xdiff/xprepare.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 7a29e5fc474..11bada2608a 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -170,12 +170,6 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 
 	if (!XDL_CALLOC_ARRAY(xdf->changed, xdf->nrec + 2))
 		goto abort;
-
-	if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) &&
-	    (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)) {
-		if (!XDL_ALLOC_ARRAY(xdf->reference_index, xdf->nrec + 1))
-			goto abort;
-	}
 
 	xdf->changed += 1;
 	xdf->nreff = 0;
@@ -283,7 +277,10 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
 	 * changed[i] should remain false, or become true.
 	 */
 	if (!XDL_CALLOC_ARRAY(action1, len1) ||
-	    !XDL_CALLOC_ARRAY(action2, len2)) {
+	    !XDL_CALLOC_ARRAY(action2, len2) ||
+	    !XDL_ALLOC_ARRAY(xdf1->reference_index, len1) ||
+	    !XDL_ALLOC_ARRAY(xdf2->reference_index, len2))
+	{
 		ret = -1;
 		goto cleanup;
 	}
-- 
2.54.0.rc1.174.gd833f386ac5.dirty
Previous: Phillip Wood
Message 14 of 14 in “xdiff: reduce the size of a couple of arrays”
  1. 0/4 xdiff: reduce the size of a couple of arraysPhillip Wood, Apr 2, 2026
  2. 1/4 xdiff: reduce size of action arraysPhillip Wood, Apr 2, 2026
  3. Junio C HamanoApr 2, 2026
  4. 2/4 xdiff: cleanup xdl_clean_mmatch()Phillip Wood, Apr 2, 2026
  5. Junio C HamanoApr 2, 2026
  6. 3/4 xprepare: simplify error handlingPhillip Wood, Apr 2, 2026
  7. Junio C HamanoApr 2, 2026
  8. 4/4 xdiff: reduce the size of arrayPhillip Wood, Apr 2, 2026
  9. Junio C HamanoApr 2, 2026
  10. 0/4 xdiff: reduce the size of a couple of arraysPhillip Wood, May 4, 2026
  11. 1/4 xdiff: reduce size of action arraysPhillip Wood, May 4, 2026
  12. 2/4 xdiff: cleanup xdl_clean_mmatch()Phillip Wood, May 4, 2026
  13. 3/4 xprepare: simplify error handlingPhillip Wood, May 4, 2026
  14. 4/4 xdiff: reduce the size of arrayPhillip Wood, May 4, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.