Merge remaining audit patch (save dlfcn.c)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3436 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 4 deletions

diff --git a/res/res_crypto.c b/res/res_crypto.c
index 8df8d2b4c..706171590 100755
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -213,9 +213,9 @@ static struct ast_key *try_load_key (char *dir, char *fname, int ifd, int ofd, i
 	if (found)
 		ast_mutex_lock(&keylock);
 	/* First the filename */
-	strncpy(key->fn, ffname, sizeof(key->fn));
+	strncpy(key->fn, ffname, sizeof(key->fn) - 1);
 	/* Then the name */
-	strncpy(key->name, fname, sizeof(key->name));
+	strncpy(key->name, fname, sizeof(key->name) - 1);
 	key->ktype = ktype;
 	/* Yes, assume we're going to be deleted */
 	key->delme = 1;
@@ -444,14 +444,14 @@ static int init_keys(int fd, int argc, char *argv[])
 	struct ast_key *key;
 	int ign;
 	char *kn;
-	char tmp[256];
+	char tmp[256] = "";
 
 	key = keys;
 	while(key) {
 		/* Reload keys that need pass codes now */
 		if (key->ktype & KEY_NEEDS_PASSCODE) {
 			kn = key->fn + strlen(ast_config_AST_KEY_DIR) + 1;
-			strncpy(tmp, kn, sizeof(tmp));
+			strncpy(tmp, kn, sizeof(tmp) - 1);
 			try_load_key((char *)ast_config_AST_KEY_DIR, tmp, fd, fd, &ign);
 		}
 		key = key->next;