[nostalgia/gfx/studio/tilesheet] Fix overrun errors when switching subsheets, clear selection on switch

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.cpp

@@ -27,11 +27,14 @@ CutPasteCommand::CutPasteCommand(
 		TileSheet::SubSheetIdx subSheetIdx,
 		ox::Point const&dstStart,
 		ox::Point dstEnd,
-		TileSheetClipboard const&cb) noexcept:
+		TileSheetClipboard const&cb):
 		m_commandId(commandId),
 		m_img(img),
 		m_subSheetIdx(std::move(subSheetIdx)) {
 	auto const&ss = getSubSheet(m_img, m_subSheetIdx);
+	if (dstStart.x >= ss.columns * TileWidth || dstStart.y >= ss.rows * TileHeight) {
+		throw ox::Exception{1, "paste starts beyond the bounds of target"};
+	}
 	dstEnd.x = std::min(ss.columns * TileWidth - 1, dstEnd.x);
 	dstEnd.y = std::min(ss.rows * TileHeight - 1, dstEnd.y);
 	for (auto const&p : cb.pixels()) {

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.hpp

@@ -69,7 +69,7 @@ class CutPasteCommand: public TileSheetCommand {
 				TileSheet::SubSheetIdx subSheetIdx,
 				ox::Point const&dstStart,
 				ox::Point dstEnd,
-				TileSheetClipboard const&cb) noexcept;
+				TileSheetClipboard const&cb);
 
 		ox::Error redo() noexcept final;
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp

@@ -46,13 +46,13 @@ Palette const TileSheetEditorModel::s_defaultPalette = {
 
 TileSheetEditorModel::TileSheetEditorModel(
 		studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack):
-		m_sctx(sctx),
+		m_sctx{sctx},
-		m_tctx(m_sctx.tctx),
+		m_tctx{m_sctx.tctx},
-		m_path(std::move(path)),
+		m_path{std::move(path)},
-		m_img(*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()),
+		m_img{*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()},
 		// ignore failure to load palette
-		m_pal(readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value),
+		m_pal{readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value},
-		m_undoStack(undoStack) {
+		m_undoStack{undoStack} {
 	normalizeSubsheets(m_img.subsheet);
 	m_pal.updated.connect(this, &TileSheetEditorModel::markUpdated);
 	m_undoStack.changeTriggered.connect(this, &TileSheetEditorModel::markUpdatedCmdId);
@@ -67,19 +67,27 @@ void TileSheetEditorModel::cut() {
 	TileSheetClipboard blankCb;
 	auto cb = ox::make_unique<TileSheetClipboard>();
 	auto const&s = activeSubSheet();
-	iterateSelectionRows(*m_selection, [&](int const x, int const y) {
+	if (iterateSelectionRows(*m_selection, [&](int const x, int const y) {
 		auto pt = ox::Point{x, y};
 		auto const idx = gfx::idx(s, pt);
-		auto const c = getPixel(s, idx);
+		if (idx >= s.pixels.size()) {
+			return ox::Error{1, "invalid idx"};
+		}
+		auto const c = s.pixels[idx];
 		pt -= m_selection->a;
 		cb->addPixel(pt, c);
 		blankCb.addPixel(pt, 0);
-	});
+		return ox::Error{};
+	})) {
+		return;
+	}
 	auto const pt1 = m_selection->a;
 	auto const pt2 = ox::Point{s.columns * TileWidth, s.rows * TileHeight};
 	turbine::setClipboardObject(m_tctx, std::move(cb));
-	std::ignore = pushCommand(ox::make<CutPasteCommand>(
+	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
-		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb));
+		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb); cmd.ok()) {
+		std::ignore = pushCommand(cmd.value);
+	}
 }
 
 void TileSheetEditorModel::copy() {
@@ -87,14 +95,20 @@ void TileSheetEditorModel::copy() {
 		return;
 	}
 	auto cb = ox::make_unique<TileSheetClipboard>();
-	iterateSelectionRows(*m_selection, [&](int const x, int const y) {
+	if (iterateSelectionRows(*m_selection, [&](int const x, int const y) {
 		auto pt = ox::Point{x, y};
 		auto const&s = activeSubSheet();
 		auto const idx = gfx::idx(s, pt);
-		auto const c = getPixel(s, idx);
+		if (idx >= s.pixels.size()) {
+			return ox::Error{1, "invalid idx"};
+		}
+		auto const c = s.pixels[idx];
 		pt -= m_selection->a;
 		cb->addPixel(pt, c);
-	});
+		return ox::Error{};
+	})) {
+		return;
+	}
 	turbine::setClipboardObject(m_tctx, std::move(cb));
 }
 
@@ -111,8 +125,10 @@ void TileSheetEditorModel::paste() {
 	auto const&s = activeSubSheet();
 	auto const pt1 = m_selection->a;
 	auto const pt2 = ox::Point{s.columns * TileWidth, s.rows * TileHeight};
-	std::ignore = pushCommand(ox::make<CutPasteCommand>(
+	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
-		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb));
+		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb); cmd.ok()) {
+		std::ignore = pushCommand(cmd.value);
+	}
 }
 
 bool TileSheetEditorModel::acceptsClipboardPayload() const noexcept {
@@ -152,7 +168,7 @@ void TileSheetEditorModel::drawCommand(ox::Point const &pt, std::size_t const pa
 	auto const idx = gfx::idx(activeSubSheet, pt);
 	if (m_ongoingDrawCommand) {
 		m_updated = m_updated || m_ongoingDrawCommand->append(idx);
-	} else if (getPixel(activeSubSheet, idx) != palIdx) {
+	} else if (activeSubSheet.pixels[idx] != palIdx) {
 		std::ignore = pushCommand(ox::make<DrawCommand>(
 			m_img, m_activeSubsSheetIdx, idx, static_cast<int>(palIdx)));
 	}
@@ -213,6 +229,7 @@ ox::Error TileSheetEditorModel::updateSubsheet(
 void TileSheetEditorModel::setActiveSubsheet(TileSheet::SubSheetIdx const&idx) noexcept {
 	m_activeSubsSheetIdx = idx;
 	this->activeSubsheetChanged.emit(m_activeSubsSheetIdx);
+	clearSelection();
 }
 
 void TileSheetEditorModel::fill(ox::Point const&pt, int const palIdx) noexcept {
@@ -381,7 +398,7 @@ void TileSheetEditorModel::getFillPixels(
 		int const oldColor) const noexcept {
 	auto const idx = ptToIdx(pt, activeSubSheet.columns);
 	auto const relIdx = idx % PixelsPerTile;
-	if (pixels[relIdx] || getPixel(activeSubSheet, idx) != oldColor) {
+	if (pixels[relIdx] || activeSubSheet.pixels[idx] != oldColor) {
 		return;
 	}
 	// mark pixels to update
@@ -419,7 +436,7 @@ void TileSheetEditorModel::setPalPath() noexcept {
 }
 
 ox::Error TileSheetEditorModel::pushCommand(studio::UndoCommand *cmd) noexcept {
-	std::ignore = m_undoStack.push(ox::UPtr<studio::UndoCommand>{cmd});
+	std::ignore = m_undoStack.push(ox::UPtr{cmd});
 	m_ongoingDrawCommand = dynamic_cast<DrawCommand*>(cmd);
 	m_updated = true;
 	return {};