shithub: scc

Info  •  Files  •  Log  •  Branches

[ld] Fix merge()

We were incrementing the number of sections per segment in every
iteration instead of every match. This was creating NULL entries
in the section array of every segment.

--- a/src/cmd/ld/pass2.c

+++ b/src/cmd/ld/pass2.c

@@ -36,17 +36,17 @@

 merge(Segment *seg)

 {

 	Section *sec, **p;

-	int n;

+	int n = 0;

-	for (n = 0, sec = sechead; sec; sec = sec->next, ++n) {

+	for (sec = sechead; sec; sec = sec->next) {

 		if (sec->type != seg->type)

 			continue;

-		p = realloc(seg->sections, n * sizeof(*p));

+		p = realloc(seg->sections, (n+1) * sizeof(*p));

 		if (!p) {

 			error("ou of memory");

 			exit(EXIT_FAILURE);

 		}

-		p[n] = sec;

+		p[n++] = sec;

 		seg->sections = p;

 		seg->size += sec->size;

 	}