curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 19:51:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

playwav: parser more resilient against fields with extra zeros

Browse Source
This commit is contained in:
minjaesong
2023-01-25 18:46:55 +09:00
parent 801ae0c29b
commit 1f0b8a0a8d
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
assets/disk0/tvdos/bin/playwav.js
View File

@@ -13,7 +13,7 @@ const pcm = require("pcm")
function printComments() {
for (const [key, value] of Object.entries(comments)) {
printdbg(`${key}: ${value}`)
printdbg(`Wave Comment ${key}: ${value}`)
}
}
@@ -207,14 +207,31 @@ while (!stopPlay && seqread.getReadCount() < FILE_SIZE - 8) {
let startOffset = seqread.getReadCount()
let subChunkName = seqread.readFourCC()
while (seqread.getReadCount() < startOffset + chunkSize) {
printdbg(`${chunkName} ${subChunkName}`)
if ("INFO" == subChunkName) {
let key = seqread.readFourCC()
let valueLen = seqread.readInt()
// f-you WAVE encoders with nonstandard behaviours
// related: https://stackoverflow.com/questions/49537639/riff-icmt-tag-size-doesnt-seem-to-match-data
while (0 == key.charCodeAt(0)) {
printdbg(`Previous key had more zero bytes padded than its marked length, skipping one byte...`)
let kbytes = [key.charCodeAt(1), key.charCodeAt(2), key.charCodeAt(3), valueLen & 255]
let klen = [(valueLen >>> 8) & 255, (valueLen >>> 16) & 255, (valueLen >>> 24) & 255, seqread.readOneByte()]
key = String.fromCharCode.apply(null, kbytes)
valueLen = klen[0] | (klen[1] << 8) | (klen[2] << 16) | (klen[3] << 24)
}
printdbg(`Reading LIST INFO ${key}[${[0,1,2,3].map((i)=>"0x"+key.charCodeAt(i).toString(16).padStart(2,'0'))}] (${valueLen} bytes): `)
let value = seqread.readString(valueLen)
printdbg(" |"+value)
comments[key] = value
}
else {
printdbg(`LIST skip subchunk ${subChunkName} (${startOffset + chunkSize - seqread.getReadCount()} bytes)`)
seqread.skip(startOffset + chunkSize - seqread.getReadCount())
}
}

5
tsvm_core/src/net/torvald/tsvm/VM.kt
View File

@@ -3,6 +3,7 @@ package net.torvald.tsvm
import kotlinx.coroutines.Job
import net.torvald.UnsafeHelper
import net.torvald.UnsafePtr
import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.toHex
import net.torvald.tsvm.peripheral.IOSpace
import net.torvald.tsvm.peripheral.PeriBase
import net.torvald.tsvm.peripheral.VMProgramRom
@@ -240,7 +241,7 @@ class VM(
if (size <= 0) throw IllegalArgumentException("Invalid malloc size: $size")
val allocBlocks = ceil(size.toDouble() / MALLOC_UNIT).toInt()
val blockStart = findEmptySpace(allocBlocks) ?: throw OutOfMemoryError()
val blockStart = findEmptySpace(allocBlocks) ?: throw OutOfMemoryError("No space for $allocBlocks blocks ($size bytes requested)")
allocatedBlockCount += allocBlocks
mallocSizes[blockStart] = allocBlocks
@@ -249,7 +250,7 @@ class VM(
internal fun free(ptr: Int) {
val index = ptr / MALLOC_UNIT
val count = mallocSizes[index] ?: throw OutOfMemoryError()
val count = mallocSizes[index] ?: throw OutOfMemoryError("No allocation for pointer 0x${ptr.toHex()}")
mallocMap.set(index, index + count, false)
mallocSizes.remove(index)