languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-14 11:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dev.link] cmd/link: fix end-of-block padding (again)

Browse source 
Make sure we never overrun the end address.

Should fix AIX build.

Change-Id: I9926387d4512ec8b4acc32b7f32cee2b2aca25b4
Reviewed-on: https://go-review.googlesource.com/c/go/+/226718
Reviewed-by: Jeremy Faller <jeremy@golang.org>
This commit is contained in:
Cherry Zhang 2020-03-31 18:53:17 -04:00
parent 0e0ee115c5
commit 1cb582fe02
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cmd/link/internal/ld/data.go
View file

@ -811,7 +811,6 @@ func writeBlocks(out *OutBuf, sem chan int, syms []*sym.Symbol, addr, size int64
for addr < lastAddr {
// Find the last symbol we'd write.
idx := -1
length := int64(0)
for i, s := range syms {
// If the next symbol's size would put us out of bounds on the total length,
// stop looking.
@ -834,9 +833,15 @@ func writeBlocks(out *OutBuf, sem chan int, syms []*sym.Symbol, addr, size int64
}
// Compute the length to write, including padding.
// We need to write to the end address (lastAddr), or the next symbol's
// start address, whichever comes first. If there is no more symbols,
// just write to lastAddr. This ensures we don't leave holes between the
// blocks or at the end.
length := int64(0)
if idx+1 < len(syms) {
length = syms[idx+1].Value - addr
} else {
}
if length == 0 || length > lastAddr-addr {
length = lastAddr - addr
}