X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdemo_defkey.c;h=045c2c7bd3e86d9e519437c7ee15a6506d704c0c;hp=00c1cf300ebfed5fefb962c3c9f93b8b6cb26f0c;hb=efd717f13effbf1d0fd743a214aebc0c97c8b66c;hpb=2639531af0c3ca25b48e7bcb9c790fa566cc5892

diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index 00c1cf30..045c2c7b 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2012,2013 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.17 2007/04/07 17:13:03 tom Exp $
+ * $Id: demo_defkey.c,v 1.22 2013/09/28 22:02:17 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -76,6 +76,7 @@ visichar(int ch)
     static char temp[10];
 
     ch = UChar(ch);
+    assert(ch >= 0 && ch < 256);
     if (ch == '\\') {
 	strcpy(temp, "\\\\");
     } else if (ch == '\033') {
@@ -97,7 +98,7 @@ static char *
 visible(const char *string)
 {
     char *result = 0;
-    unsigned need = 1;
+    size_t need = 1;
     int pass;
     int n;
 
@@ -105,17 +106,17 @@ visible(const char *string)
 	for (pass = 0; pass < 2; ++pass) {
 	    for (n = 0; string[n] != '\0'; ++n) {
 		char temp[80];
-		strcpy(temp, visichar(string[n]));
+		strncpy(temp, visichar(string[n]), sizeof(temp) - 2);
 		if (pass)
 		    strcat(result, temp);
 		else
 		    need += strlen(temp);
 	    }
 	    if (!pass)
-		result = (char *) calloc(need, 1);
+		result = typeCalloc(char, need);
 	}
     } else {
-	result = (char *) calloc(1, 1);
+	result = typeCalloc(char, (size_t) 1);
     }
     return result;
 }
@@ -185,9 +186,9 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code)
 	const char *prefix = 0;
 	char temp[BUFSIZ];
 
-	if (!strncmp(value, "\033[", 2)) {
+	if (!strncmp(value, "\033[", (size_t) 2)) {
 	    prefix = "\033O";
-	} else if (!strncmp(value, "\033O", 2)) {
+	} else if (!strncmp(value, "\033O", (size_t) 2)) {
 	    prefix = "\033[";
 	}
 	if (prefix != 0) {