Fix crash in conf/etc. with empty optional values

NuSkooler · Dec 24, 2023 · 223b7b2 · 223b7b2
1 parent 6aa0c86
commit 223b7b2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/art/themes/luciano_blocktronics/CONFSCR.ANS b/art/themes/luciano_blocktronics/CONFSCR.ANS
diff --git a/art/themes/luciano_blocktronics/NUA.ANS b/art/themes/luciano_blocktronics/NUA.ANS
diff --git a/core/color_codes.js b/core/color_codes.js
@@ -98,6 +98,9 @@ function ansiSgrFromCnetStyleColorCode(cc) {
 }
 
 function renegadeToAnsi(s, client) {
+    if (!s) {
+        return '';
+    }
     if (-1 == s.indexOf('|')) {
         return s; //  no pipe codes present
     }

diff --git a/core/string_util.js b/core/string_util.js
@@ -45,6 +45,10 @@ const SIMPLE_ELITE_MAP = {
 };
 
 function stylizeString(s, style) {
+    if (!s) {
+        return '';
+    }
+
     var len = s.length;
     var c;
     var i;

diff --git a/core/text_view.js b/core/text_view.js
@@ -153,7 +153,11 @@ TextView.prototype.setText = function (text, redraw) {
 
     if (!_.isString(text)) {
         //  allow |text| to be numbers/etc.
-        text = text.toString();
+        if (_.isUndefined(text) || null === text) {
+            text = '';
+        } else {
+            text = text.toString();
+        }
     }
 
     const formatObj = getPredefinedMCIFormatObject(this.client, text);