Merge branch 'master' into medusa

CHANGES

@@ -83,6 +83,10 @@ Bugfixes:
  - GBA Video: Don't update background scanline params in mode 0 (fixes mgba.io/i/377)
  - Qt: Ensure CLI backend is attached when submitting commands (fixes mgba.io/i/662)
  - Core: Fix crash with rewind if savestates shrink
+ - Test: Fix crash when loading invalid file
+ - GBA Hardware: Fix crash if a savestate lies about game hardware
+ - Test: Fix crash when fuzzing fails to load a file
+ - GBA: Fix multiboot loading resulting in too small WRAM
 Misc:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers

src/gba/gba.c

@@ -76,6 +76,8 @@ static void GBAInit(void* cpu, struct mCPUComponent* component) {
 	gba->sio.p = gba;
 	GBASIOInit(&gba->sio);
 
+	GBAHardwareInit(&gba->memory.hw, NULL);
+
 	gba->springIRQ = 0;
 	gba->keySource = 0;
 	gba->rotationSource = 0;
@@ -295,14 +297,9 @@ bool GBALoadMB(struct GBA* gba, struct VFile* vf) {
 		gba->pristineRomSize = SIZE_WORKING_RAM;
 	}
 	gba->isPristine = true;
-#ifdef _3DS
+	gba->memory.wram = anonymousMemoryMap(SIZE_WORKING_RAM);
-	if (gba->pristineRomSize <= romBufferSize) {
+	memset(gba->memory.wram, 0, SIZE_WORKING_RAM);
-		gba->memory.wram = romBuffer;
+	vf->read(vf, gba->memory.wram, gba->pristineRomSize);
-		vf->read(vf, romBuffer, gba->pristineRomSize);
-	}
-#else
-	gba->memory.wram = vf->map(vf, gba->pristineRomSize, MAP_READ);
-#endif
 	if (!gba->memory.wram) {
 		mLOG(GBA, WARN, "Couldn't map ROM");
 		return false;

src/gba/hardware.c

@@ -73,6 +73,9 @@ void GBAHardwareClear(struct GBACartridgeHardware* hw) {
 }
 
 void GBAHardwareGPIOWrite(struct GBACartridgeHardware* hw, uint32_t address, uint16_t value) {
+	if (!hw->gpioBase) {
+		return;
+	}
 	switch (address) {
 	case GPIO_REG_DATA:
 		hw->pinState &= ~hw->direction;

src/platform/qt/DebuggerConsoleController.cpp

@@ -80,10 +80,11 @@ const char* DebuggerConsoleController::readLine(struct CLIDebuggerBackend* be, s
 	while (self->m_lines.isEmpty()) {
 		self->m_cond.wait(&self->m_mutex);
 	}
-	self->m_last = self->m_lines.takeFirst().toUtf8();
+	QString last = self->m_lines.takeFirst();
-	if (self->m_last.isEmpty()) {
+	if (last.isNull()) {
-		self->m_last = "\n";
+		return nullptr;
 	}
+	self->m_last = last.toUtf8();
 	*len = self->m_last.size();
 	return self->m_last.constData();
 
@@ -101,7 +102,7 @@ const char* DebuggerConsoleController::historyLast(struct CLIDebuggerBackend* be
 	GameController::Interrupter interrupter(self->m_gameController, true);
 	QMutexLocker lock(&self->m_mutex);
 	if (self->m_history.isEmpty()) {
-		return "\n";
+		return "i";
 	}
 	self->m_last = self->m_history.last().toUtf8();
 	return self->m_last.constData();

src/platform/qt/Window.cpp

@@ -158,6 +158,7 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent)
 #endif
 	m_screenWidget->setPixmap(m_logo);
 	m_screenWidget->setCenteredAspectRatio(m_logo.width(), m_logo.height());
+	m_screenWidget->setLockIntegerScaling(false);
 	setCentralWidget(m_screenWidget);
 
 	connect(m_controller, SIGNAL(gameStarted(mCoreThread*, const QString&)), this, SLOT(gameStarted(mCoreThread*, const QString&)));
@@ -795,6 +796,7 @@ void Window::gameStarted(mCoreThread* context, const QString& fname) {
 	context->core->desiredVideoDimensions(context->core, &width, &height);
 	m_display->setMinimumSize(width, height);
 	m_screenWidget->setMinimumSize(m_display->minimumSize());
+	m_config->updateOption("lockIntegerScaling");
 	if (m_savedScale > 0) {
 		resizeFrame(QSize(width, height) * m_savedScale);
 	}
@@ -858,6 +860,7 @@ void Window::gameStopped() {
 	updateTitle();
 	detachWidget(m_display);
 	m_screenWidget->setCenteredAspectRatio(m_logo.width(), m_logo.height());
+	m_screenWidget->setLockIntegerScaling(false);
 	m_screenWidget->setPixmap(m_logo);
 	m_screenWidget->unsetCursor();
 #ifdef M_CORE_GB
@@ -1342,7 +1345,9 @@ void Window::setupMenu(QMenuBar* menubar) {
 	lockIntegerScaling->addBoolean(tr("Force integer scaling"), avMenu);
 	lockIntegerScaling->connect([this](const QVariant& value) {
 		m_display->lockIntegerScaling(value.toBool());
-		m_screenWidget->setLockIntegerScaling(value.toBool());
+		if (m_controller->isLoaded()) {
+			m_screenWidget->setLockIntegerScaling(value.toBool());
+		}
 	}, this);
 	m_config->updateOption("lockIntegerScaling");
 

src/platform/test/fuzz-main.c

@@ -68,6 +68,9 @@ int main(int argc, char** argv) {
 		return 0;
 	}
 	struct mCore* core = mCoreFind(args.fname);
+	if (!core) {
+		return 1;
+	}
 	core->init(core);
 	mCoreInitConfig(core, "fuzz");
 	applyArguments(&args, NULL, &core->config);
@@ -91,10 +94,15 @@ int main(int argc, char** argv) {
 #ifdef __AFL_HAVE_MANUAL_CONTROL
 	__AFL_INIT();
 #endif
+
+	bool cleanExit = true;
+	if (!mCoreLoadFile(core, args.fname)) {
+		cleanExit = false;
+		goto loadError;
+	}
 	if (args.patch) {
 		core->loadPatch(core, VFileOpen(args.patch, O_RDONLY));
 	}
-	mCoreLoadFile(core, args.fname);
 
 	struct VFile* savestate = 0;
 	struct VFile* savestateOverlay = 0;
@@ -155,13 +163,14 @@ int main(int argc, char** argv) {
 		savestateOverlay->close(savestateOverlay);
 	}
 
+loadError:
 	freeArguments(&args);
 	if (outputBuffer) {
 		free(outputBuffer);
 	}
 	core->deinit(core);
 
-	return 0;
+	return !cleanExit;
 }
 
 static void _fuzzRunloop(struct mCore* core, int frames) {