Skip to content

Commit 3bdfdc5

Browse files
committed
Fix an issue in peek argument validation
also remove some logging statements
1 parent e09e1e2 commit 3bdfdc5

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

source/picoluaapi.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,9 +1099,9 @@ int peek(lua_State *L) {
10991099

11001100
if (numArgs > 1) {
11011101
int tmpNumToReturn = lua_tonumber(L,2);
1102-
//pico 8 docs say up to 8192
1103-
if (tmpNumToReturn > 0 && tmpNumToReturn <= 8192) {
1104-
numToReturn = tmpNumToReturn;
1102+
//pico 8 docs say up to 8192 - clamp to this limit
1103+
if (tmpNumToReturn > 0) {
1104+
numToReturn = tmpNumToReturn > 8192 ? 8192 : tmpNumToReturn;
11051105
}
11061106
}
11071107

source/vm.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,13 +1276,9 @@ void Vm::vm_run() {
12761276
// loadCart(_loadedCart);
12771277
// }
12781278

1279-
Logger_Write("vm_run: before Reset(), screenDataMemMapping = 0x%02x\n", _memory->hwState.screenDataMemMapping);
1280-
12811279
//should combine this with other memory reset code
12821280
_memory->Reset();
12831281

1284-
Logger_Write("vm_run: after Reset(), screenDataMemMapping = 0x%02x\n", _memory->hwState.screenDataMemMapping);
1285-
12861282
//seed rng
12871283
auto now = std::chrono::high_resolution_clock::now();
12881284
api_srand(fix32::frombits((int32_t)now.time_since_epoch().count()));
@@ -1344,7 +1340,6 @@ bool Vm::vm_load(std::string filename, std::string breadcrumb, std::string param
13441340
_prevCartKey = CurrentCartFilename();
13451341

13461342
bool success = LoadCart(filename);
1347-
Logger_Write("vm_load: load result: %s\n", success ? "true" : "false");
13481343

13491344
// Only run if cart loaded successfully
13501345
if (success) {

0 commit comments

Comments
 (0)