Skip to content

nintendoswitch: Fix invalid memory read / write in print calls #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 9, 2020
Merged

nintendoswitch: Fix invalid memory read / write in print calls #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e41db0c
nintendoswitch: Fix invalid memory read / write in print calls
racerxdl Sep 8, 2020
ad8e548
nintendoswitch: fix formatting in runtime_nintendoswitch_heap.go
racerxdl Sep 8, 2020
0bc06e3
nintendoswitch: some fixes / chores for runtime
racerxdl Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/runtime/runtime_nintendoswitch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,18 @@ func ticks() timeUnit {
return timeUnit(ticksToNanoseconds(timeUnit(getArmSystemTick())))
}

var stdoutBuffer = make([]byte, 0, 120)
var stdoutBuffer = make([]byte, 120)
var position = 0

func putchar(c byte) {
if c == '\n' || len(stdoutBuffer)+1 >= 120 {
NxOutputString(string(stdoutBuffer))
stdoutBuffer = stdoutBuffer[:0]
if c == '\n' || position > len(stdoutBuffer) {
nxOutputString(&stdoutBuffer[0], uint64(position))
position = 0
return
}

stdoutBuffer = append(stdoutBuffer, c)
}

func usleep(usec uint) int {
sleepThread(uint64(usec) * 1000)
return 0
stdoutBuffer[position] = c
position++
}

func abort() {
Expand Down
8 changes: 1 addition & 7 deletions src/runtime/runtime_nintendoswitch_heap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,11 @@

package runtime

import "unsafe"

const heapSize = 0x2000000 * 16 // Default by libnx

//go:extern _stack_top
var stackTopSymbol [0]byte

var (
heapStart = uintptr(0)
heapEnd = uintptr(0)
stackTop = uintptr(unsafe.Pointer(&stackTopSymbol))
)

//export setHeapSize
Expand All @@ -24,7 +18,7 @@ func preinit() {
setHeapSize(&heapStart, heapSize)

if heapStart == 0 {
panic("failed to allocate heap")
runtimePanic("failed to allocate heap")
}

heapEnd = heapStart + heapSize
Expand Down