mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
fix a bunch of potential problems found by gcc 4.3.x, primarily bare strings being passed to printf()-like functions and ignored results from read()/write() and friends
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@153337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -118,7 +118,11 @@ static int pw_cb(char *buf, int size, int rwflag, void *userdata)
|
||||
if (key->infd > -1) {
|
||||
snprintf(prompt, sizeof(prompt), ">>>> passcode for %s key '%s': ",
|
||||
key->ktype == AST_KEY_PRIVATE ? "PRIVATE" : "PUBLIC", key->name);
|
||||
write(key->outfd, prompt, strlen(prompt));
|
||||
if (write(key->outfd, prompt, strlen(prompt)) < 0) {
|
||||
/* Note that we were at least called */
|
||||
key->infd = -2;
|
||||
return -1;
|
||||
}
|
||||
memset(buf, 0, sizeof(buf));
|
||||
tmp = ast_hide_password(key->infd);
|
||||
memset(buf, 0, size);
|
||||
@@ -194,8 +198,7 @@ static struct ast_key *try_load_key (char *dir, char *fname, int ifd, int ofd, i
|
||||
/* Calculate a "whatever" quality md5sum of the key */
|
||||
char buf[256];
|
||||
memset(buf, 0, 256);
|
||||
fgets(buf, sizeof(buf), f);
|
||||
if (!feof(f)) {
|
||||
if (fgets(buf, sizeof(buf), f)) {
|
||||
MD5Update(&md5, (unsigned char *) buf, strlen(buf));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user