changed strncpy macro to include max sizes for both source and destination.

piot · piot · commit 4af2a183cbd1 · 2012-02-17T00:07:25.000+01:00
diff --git a/src/include/tyranscript/tyran_config.h b/src/include/tyranscript/tyran_config.h
@@ -21,17 +21,19 @@ typedef unsigned short tyran_uint16;
 #define tyran_memcmp memcmp
 
 #if defined WIN32
+	#pragma warning( disable : 4100 )
+
 	#define tyran_sscanf sscanf_s
 	#define tyran_snprintf sprintf_s
-	#define tyran_strncpy(a, b, c) strncpy_s(a, 1, b, c)
+	#define tyran_strncpy(dest, dest_size, source, source_size) strncpy_s(dest, dest_size, source, source_size)
 	#define tyran_fopen fopen_s
 	#define tyran_fread fread
 	#define tyran_fclose fclose
 	#define tyran_strncat strncat_s
 #else
 	#define tyran_sscanf sscanf
 	#define tyran_snprintf snprintf
-	#define tyran_strncpy strncpy
+	#define tyran_strncpy(dest, dest_size, source, source_size) strncpy(dest, source, dest_size)
 	#define tyran_strncat strncat
 	#define tyran_fopen(F, N, M) *F = fopen(N, M)
 	#define tyran_fread fread
diff --git a/src/lib/debug/tyran_print_value.c b/src/lib/debug/tyran_print_value.c
@@ -47,7 +47,7 @@ void tyran_value_to_c_string(const tyran_value* v, char* buf, int max_length, in
 			if (quote) {
 				tyran_snprintf(buf, max_length, "'%s'", temp_buffer);
 			} else {
-				tyran_strncpy(buf, temp_buffer, temp_buffer_size);
+				tyran_strncpy(buf, max_length, temp_buffer, temp_buffer_size);
 			}
 			break;
 		case TYRAN_VALUE_TYPE_VARIABLE: {
@@ -152,7 +152,7 @@ void tyran_print_value_helper(int tabs, const char* property, const tyran_value*
 		default: {
 			char buf[2048];
 			tyran_value_to_c_string(v, buf, 2048, quote);
-			tyran_strncpy(value, buf, max_size);
+			tyran_strncpy(value, max_size, buf, 2048);
 			}
 			break;
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void tyran_value_to_c_string(const tyran_value* v, char* buf, int max_length, in`
`47`	`47`	`if (quote) {`
`48`	`48`	`tyran_snprintf(buf, max_length, "'%s'", temp_buffer);`
`49`	`49`	`} else {`
`50`		`- tyran_strncpy(buf, temp_buffer, temp_buffer_size);`
	`50`	`+ tyran_strncpy(buf, max_length, temp_buffer, temp_buffer_size);`
`51`	`51`	`}`
`52`	`52`	`break;`
`53`	`53`	`case TYRAN_VALUE_TYPE_VARIABLE: {`
`@@ -152,7 +152,7 @@ void tyran_print_value_helper(int tabs, const char* property, const tyran_value*`
`152`	`152`	`default: {`
`153`	`153`	`char buf[2048];`
`154`	`154`	`tyran_value_to_c_string(v, buf, 2048, quote);`
`155`		`- tyran_strncpy(value, buf, max_size);`
	`155`	`+ tyran_strncpy(value, max_size, buf, 2048);`
`156`	`156`	`}`
`157`	`157`	`break;`
`158`	`158`	`}`