diff options
author | Mark Spencer <markster@digium.com> | 2004-07-14 13:57:15 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-07-14 13:57:15 +0000 |
commit | 044ad2e2e7a74049ed5c2215d00624be9f045e60 (patch) | |
tree | 30a1118273807f5c6ba0e3ca611ab0c6a160fa3b /res/res_crypto.c | |
parent | 9cd917c42a6cf0661861a7e19d4685b2449df43f (diff) |
Merge remaining audit patch (save dlfcn.c)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_crypto.c')
-rwxr-xr-x | res/res_crypto.c | 8 |
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; |