Initial work with snprintf. :D

mystic.cpp

@@ -3,10 +3,10 @@
 #include <pty.h>
 #include <stdio.h>
 #include <string.h>
-#include <termios.h>
-#include <unistd.h>
 #include <sys/select.h>
 #include <sys/wait.h>
+#include <termios.h>
+#include <unistd.h>
 
 // #include <signal.h> // handle Ctrl-C/SIGINT
 
@@ -78,7 +78,6 @@ struct console_details console;
 
 #include "utils.h"
 
-
 // END LOGGING
 
 #include "lastseen.h"
@@ -465,6 +464,9 @@ int word_wrangler(char *buffer, int len) {
 
 int buffer_insert(char *buffer, int len, int max_length, int pos,
                   const char *insert) {
+  if (strlen(insert) == 0)
+    return 0;
+
   if (len + strlen(insert) > max_length) {
     ZF_LOGD("buffer_insert failed [%s]", repr(insert));
     return 0;
@@ -566,8 +568,14 @@ int mangle(int fd, const char *buffer, int len) {
         x = randint(50) + 1;
         y = randint(12) + 1;
         char fgoto[10];
+
         if (possibles[r].rand_pos) {
-          sprintf(fgoto, "^f%02d%02d", x, y);
+          int rlen;
+
+          rlen = snprintf(fgoto, sizeof(fgoto), "^f%02d%02d", x, y);
+          if (rlen >= sizeof(fgoto)) {
+            ZF_LOGE("snprintf %d > buffer size %d", rlen, (int)sizeof(fgoto));
+          }
         } else {
           strcpy(fgoto, "^F");
         }
@@ -617,14 +625,18 @@ int mangle(int fd, const char *buffer, int len) {
         if (1) { // random_activate(4)) {
           int r;
           char display[100] = "";
-          /* 
+          /*
           Interesting note here:
           "Anyone there" qualifies as a valid WORDS regex match.
           It is possible that it can get mangled/wrangled!
           */
-          const char *phrasing[] = {"^R1Haha^P1ha^P1ha", "Poof!", "Got U",
-                                    "Anyone there?", "^R1Knock, ^P1Knock",
-                                    "^G0101^C07^S6Segmentation Fault ^P1^S9(core ^C12^C24dumped^C07)^P2"};
+          const char *phrasing[] = {"^R1Haha^P1ha^P1ha",
+                                    "Poof!",
+                                    "Got U",
+                                    "Anyone there?",
+                                    "^R1Knock, ^P1Knock",
+                                    "^G0101^C07^S6Segmentation Fault "
+                                    "^P1^S9(core ^C12^C24dumped^C07)^P2"};
           static LastSeen last_phrasing(2);
 
           ZF_LOGI("mangle(ANSI_CLS)");
@@ -637,10 +649,11 @@ int mangle(int fd, const char *buffer, int len) {
           // Add in random text, plus color!
           do {
             r = random() % ((sizeof(phrasing) / sizeof(char *)) - 1);
-            // Does this drop the last element in phrasing? (Seems like it takes awhile to get Seg Fault spoof, might be why)
+            // Does this drop the last element in phrasing? (Seems like it takes
+            // awhile to get Seg Fault spoof, might be why)
           } while (last_phrasing.seen_before(r));
 
-	      r = 5;
+          r = 5;
 
           int color = random() % 15 + 1;
           int x = random() % 30 + 1;
@@ -660,13 +673,22 @@ int mangle(int fd, const char *buffer, int len) {
           HOME, CLS, HOME, ...  Not sure what others do there.  We'll see.
           */
 
-          sprintf(display, "^G%02d%02d^S3^C%02d^P1%s^S0^R0%s^P1^G0101", x, y,
-                  color, phrasing[r], restore_color);
+          int slen = snprintf(display, sizeof(display),
+                              "^G%02d%02d^S3^C%02d^P1%s^S0^R0%s^P1^G0101", x, y,
+                              color, phrasing[r], restore_color);
+          if (slen >= sizeof(display)) {
+            ZF_LOGE("display snprintf failed %d > buffer size %d (%s)", slen,
+                    (int)sizeof(display), phrasing[r]);
+            display[0] = 0;
+          }
+          ZF_LOGD("snprintf %d, max %d", slen, (int)sizeof(display));
 
           // sprintf(display, "^P1^S3^C%02d%s^S0^R0%s^P1", color, phrasing[r],
           // restore_color);
-          // Added debug statement so we can identify what was sent... color, number picked and what that is
-          ZF_LOGD("mangle(ANSI_CLS): Inserted color=%02d r=%d phrase='%s'", color, r, phrasing[r]);
+          // Added debug statement so we can identify what was sent... color,
+          // number picked and what that is
+          ZF_LOGD("mangle(ANSI_CLS): Inserted color=%02d r=%d phrase='%s'",
+                  color, r, phrasing[r]);
           ZF_LOGI_MEM(play, len, "mangle(ANSI_CLS) :");
 
           // Move the buffer so there's room for the display string.
@@ -740,7 +762,7 @@ int mangle(int fd, const char *buffer, int len) {
    I'd want mangle and wrangle to work.
 
    The Message menu -- doesn't hardly get mangled at all (at least on
-   my test site).  Because all of the color changes break up the 
+   my test site).  Because all of the color changes break up the
    words in the menu.
    */
   x = rx_match(&WORDS, work);
@@ -811,7 +833,7 @@ int harry_happens(time_t *last_event, int wakeup) {
 
 /*
 
-This is done.  :D  My buffering system works with stack'em.  
+This is done.  :D  My buffering system works with stack'em.
 
 TO FIX:  Stop using c strings, must use char * buffer + int length.
 MAY CONTAIN NULL VALUES.

render.cpp

@@ -107,6 +107,7 @@ const int MYSTIC[] = {0, 4, 2, 6, 1, 5, 3, 7};
 
 void write_color(int fd, int color) {
   char buffer[12];
+  int slen;
 
   switch (color) {
   case 0:
@@ -117,7 +118,10 @@ void write_color(int fd, int color) {
   case 5:
   case 6:
   case 7:
-    sprintf(buffer, "\x1b[0;3%dm", MYSTIC[color]);
+    slen = snprintf(buffer, sizeof(buffer), "\x1b[0;3%dm", MYSTIC[color]);
+    if (slen >= sizeof(buffer)) {
+      ZF_LOGE("snprintf failed write_color(%d)", color);
+    }
     break;
   case 8:
   case 9:
@@ -127,7 +131,10 @@ void write_color(int fd, int color) {
   case 13:
   case 14:
   case 15:
-    sprintf(buffer, "\x1b[0;1;3%dm", MYSTIC[color - 8]);
+    slen = snprintf(buffer, sizeof(buffer), "\x1b[0;1;3%dm", MYSTIC[color - 8]);
+    if (slen >= sizeof(buffer)) {
+      ZF_LOGE("snprintf failed write_color(%d)", color);
+    }
     break;
   case 16:
   case 17:
@@ -137,7 +144,10 @@ void write_color(int fd, int color) {
   case 21:
   case 22:
   case 23:
-    sprintf(buffer, "\x1b[4%dm", MYSTIC[color - 16]);
+    slen = snprintf(buffer, sizeof(buffer), "\x1b[4%dm", MYSTIC[color - 16]);
+    if (slen >= sizeof(buffer)) {
+      ZF_LOGE("snprintf failed write_color(%d)", color);
+    }
     break;
   case 24:
   case 25:
@@ -147,7 +157,10 @@ void write_color(int fd, int color) {
   case 29:
   case 30:
   case 31:
-    sprintf(buffer, "\x1b[5;4%dm", MYSTIC[color - 24]);
+    slen = snprintf(buffer, sizeof(buffer), "\x1b[5;4%dm", MYSTIC[color - 24]);
+    if (slen >= sizeof(buffer)) {
+      ZF_LOGE("snprintf failed write_color(%d)", color);
+    }
     break;
   default:
     buffer[0] = 0;