From: Jason S. Ninneman <jsn@mbar.us>
Date: Sun, 11 Jun 2017 02:00:44 +0000 (-0700)
Subject: More SPEAK() hardening.
X-Git-Tag: 1.1~440
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3ed8b91eb7f636e49fd8e5f4cdea495ba410b6cb;p=open-adventure.git

More SPEAK() hardening.
---

diff --git a/misc.c b/misc.c
index 91f2dfa..fbfee4f 100644
--- a/misc.c
+++ b/misc.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <ctype.h>
 
 #include "advent.h"
 #include "database.h"
@@ -50,7 +51,7 @@ void SPEAK(vocab_t msg)
 		return;
 	    if (prmtyp == ascii_to_advent['S']) {
 		SHFTXT(LNPOSN+2,-1);
-		INLINE[LNPOSN] = 55;
+		INLINE[LNPOSN] = ascii_to_advent['s'];
 		if (PARMS[nparms] == 1)
 		    SHFTXT(LNPOSN+1,-1);
 		++nparms;
@@ -94,7 +95,14 @@ void SPEAK(vocab_t msg)
 		PUTTXT(PARMS[nparms],&state,casemake);
 		PUTTXT(PARMS[nparms+1],&state,casemake);
 		if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z'])
-		    INLINE[i] -= 26;
+		  {
+		    // Convert to uppercase.
+		    // Round-trip to ASCII and back so that this code doesn't break when the mapping changes.
+		    // This can be simplified when mapping goes away.
+		    char this = advent_to_ascii[INLINE[i]];
+		    char uc_this = toupper(this);
+		    INLINE[i] = ascii_to_advent[uc_this];
+		  }
 		nparms += 2;
 		continue;
 	    }