From d9a0224466189d0fe1d46f21d586fa8a1a58c687 Mon Sep 17 00:00:00 2001
From: yum <yum.food.vr@gmail.com>
Date: Fri, 30 Dec 2022 02:25:50 -0800
Subject: Bugfix: regions truncate correctly at page boundaries

Boards whose size is an even multiple of CHARS_PER_SYNC would lose the
entire last region.

* Attempt to fix runaway memory usage of GUI text frames, but this needs
  more work
---
 GUI/GUI/GUI/Frame.cpp | 10 +++++-----
 GUI/GUI/GUI/Logging.h |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'GUI')

diff --git a/GUI/GUI/GUI/Frame.cpp b/GUI/GUI/GUI/Frame.cpp
index 9a43a25..bd4bbec 100644
--- a/GUI/GUI/GUI/Frame.cpp
+++ b/GUI/GUI/GUI/Frame.cpp
@@ -780,11 +780,11 @@ void Frame::OnGenerateFX(wxCommandEvent& event)
         rows = std::stoi(rows_str);
         cols = std::stoi(cols_str);
     }
-    catch (const std::invalid_argument& e) {
+    catch (const std::invalid_argument&) {
 		Log(unity_out_, "Could not parse rows \"{}\" or cols \"{}\" as an integer\n", rows_str, cols_str);
         return;
     }
-    catch (const std::out_of_range& e) {
+    catch (const std::out_of_range&) {
 		Log(unity_out_, "Rows \"{}\" or cols \"{}\" are out of range\n", rows_str, cols_str);
         return;
     }
@@ -841,7 +841,7 @@ void Frame::OnUnityParamChangeImpl() {
     int misc_bits = 9;
     int total_bits = select_bits + layer_bits + scale_bits + misc_bits;
     Log(unity_out_, "This configuration will use {} bits of avatar parameter space:\n", total_bits);
-    Log(unity_out_, "  {} bits coming from ({} chars per sync) * ({} bytes per char)\n", layer_bits, chars_per_sync, bytes_per_char);
+    Log(unity_out_, "  {} bits coming from ({} characters per sync) * ({} bytes per character)\n", layer_bits, chars_per_sync, bytes_per_char);
     Log(unity_out_, "  {} bits coming from fixed overheads\n", select_bits + scale_bits + misc_bits);
 }
 
@@ -897,11 +897,11 @@ void Frame::OnAppStart(wxCommandEvent& event) {
         cols = std::stoi(cols_str);
         window_duration = std::stoi(window_duration_str);
     }
-    catch (const std::invalid_argument& e) {
+    catch (const std::invalid_argument&) {
 		Log(transcribe_out_, "Could not parse rows \"{}\", cols \"{}\", or window duration \"{}\" as an integer\n", rows_str, cols_str);
         return;
     }
-    catch (const std::out_of_range& e) {
+    catch (const std::out_of_range&) {
 		Log(transcribe_out_, "Rows \"{}\", cols \"{}\", or window duration \"{}\" are out of range\n", rows_str, cols_str, window_duration);
         return;
     }
diff --git a/GUI/GUI/GUI/Logging.h b/GUI/GUI/GUI/Logging.h
index 95e7802..6c1bf16 100644
--- a/GUI/GUI/GUI/Logging.h
+++ b/GUI/GUI/GUI/Logging.h
@@ -25,6 +25,11 @@ namespace Logging {
 		const std::string raw = std::vformat(format, std::make_format_args(args...));
 		const std::string masked = HidePII(std::move(raw));
 		frame->AppendText(masked);
+		// Limit log to 10 MB to avoid runaway memory usage.
+		const int max_frame_len_bytes = 10 * 1000 * 1000;
+		if (frame->GetLastPosition() > max_frame_len_bytes) {
+			frame->Remove(0, frame->GetLastPosition() - max_frame_len_bytes);
+		}
 	}
 }
 
-- 
cgit v1.2.3