ncurses 6.0 - patch 20170121

[ncurses.git] / test / test_sgr.c

diff --git a/test/test_sgr.c b/test/test_sgr.c
index f924026844f2876070c2827c9cb4eccdad147dac..509033ed777444b37c94c99c531425e5375664fd 100644 (file)
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -29,13 +29,14 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.5 2016/01/09 18:15:53 tom Exp $
+ * $Id: test_sgr.c,v 1.8 2016/09/04 23:30:56 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
 #define USE_TINFO
 #include <test.priv.h>
 
+#if !HAVE_TIGETSTR
 static void failed(const char *) GCC_NORETURN;
 
 static void
@@ -44,6 +45,7 @@ failed(const char *msg)
     fprintf(stderr, "%s\n", msg);
     ExitProgram(EXIT_FAILURE);
 }
+#endif
 
 #if HAVE_TIGETSTR
 
@@ -59,8 +61,9 @@ static long total_values;
 static char *
 make_dbitem(char *p, char *q)
 {
-    char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q));
-    sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q);
+    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
+    char *result = malloc(need);
+    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
     return result;
 }
 
@@ -201,7 +204,7 @@ brute_force(const char *name)
     } else if (!VALID_STRING(my_sgr0)) {
        fprintf(stderr, "no \"sgr0\" capability found\n");
     } else {
-       char *values[MAXSGR];
+       char *values[MAXSGR + MAXPAR];
        unsigned j;
        unsigned ignore = 0;
        unsigned reason = 0;