From 20fb0080127c61511e1761492c80b6961ec81b99 Mon Sep 17 00:00:00 2001
From: Ray Chason <ray.chason@protonmail.com>
Date: Sun, 4 Jun 2023 22:17:00 -0400
Subject: [PATCH] Fix memory errors in qt_tilewidth and qt_tileheight

* qt_tilewidth and qt_tileheight are allocated with alloc() and need
  to be freed with free().
* Don't use them after they're freed. Instead, retrieve the size from
  the glyphs object.
---
 win/Qt/qt_main.cpp | 22 +++++++++++-----------
 win/Qt/qt_set.cpp  |  9 ++++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp
index a4c27a903..4f260ceba 100644
--- a/win/Qt/qt_main.cpp
+++ b/win/Qt/qt_main.cpp
@@ -877,17 +877,14 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
     int w=screensize.width()-10; // XXX arbitrary extra space for frame
     int h=screensize.height()-50;
 
-    int maxwn;
-    int maxhn;
-    if (qt_tilewidth != NULL) {
-	maxwn = atoi(qt_tilewidth) * COLNO + 10;
-    } else {
-	maxwn = 1400;
-    }
-    if (qt_tileheight != NULL) {
-	maxhn = atoi(qt_tileheight) * ROWNO * 6/4;
-    } else {
-	maxhn = 1024;
+    int maxwn = 1400;
+    int maxhn = 1024;
+    if (qt_settings != NULL) {
+        auto glyphs = &qt_settings->glyphs();
+        if (glyphs != NULL) {
+            maxwn = glyphs->width() * COLNO + 10;
+            maxhn = glyphs->height() * ROWNO * 6/4;
+        }
     }
 
     // Be exactly the size we want to be - full map...
@@ -1239,6 +1236,9 @@ void NetHackQtMainWindow::layout()
         splittersizes[2] = w / 2 - (d * 1 / 4); // status
         splittersizes[1] = d;                   // invusage
         splittersizes[0] = w / 2 - (d * 3 / 4); // messages
+        printf("w = %d d = %d splittersizes = %d %d %d\n",
+                w, d,
+                splittersizes[0], splittersizes[1], splittersizes[2]);
         hsplitter->setSizes(splittersizes);
     }
 }
diff --git a/win/Qt/qt_set.cpp b/win/Qt/qt_set.cpp
index 4703839f5..8fc469da0 100644
--- a/win/Qt/qt_set.cpp
+++ b/win/Qt/qt_set.cpp
@@ -118,11 +118,13 @@ NetHackQtSettings::NetHackQtSettings() :
     // Tile/font sizes read from .nethackrc
     if (qt_tilewidth != NULL) {
 	tilewidth.setValue(atoi(qt_tilewidth));
-	delete[] qt_tilewidth;
+	free(qt_tilewidth);
+        qt_tilewidth = NULL;
     }
     if (qt_tileheight != NULL) {
 	tileheight.setValue(atoi(qt_tileheight));
-	delete[] qt_tileheight;
+	free(qt_tileheight);
+        qt_tileheight = NULL;
     }
     if (qt_fontsize != NULL) {
 	switch (tolower(qt_fontsize[0])) {
@@ -132,7 +134,8 @@ NetHackQtSettings::NetHackQtSettings() :
 	  case 's': default_fontsize = 3; break;
 	  case 't': default_fontsize = 4; break;
 	}
-	delete[] qt_fontsize;
+	free(qt_fontsize);
+        qt_fontsize = NULL;
     }
 
     theglyphs=new NetHackQtGlyphs();