emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu: fix strncpy usage 

Ensure the resulting strings are \0-terminated.
This commit is contained in:
djcb 2018-06-11 09:18:27 +03:00
parent 088064d5e1
commit 2d954e9647
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mu-contacts.c
View File

@ -225,14 +225,17 @@ mu_contacts_clear (MuContacts *self)
static const char*
encode_email_address (const char *addr)
{
static char enc[254 + 1]; /* max size for an e-mail addr */
char *cur;
static char enc[254 + 1]; /* max size for an e-mail addr */
char *cur;
if (!addr)
return FALSE;
cur = strncpy(enc, addr, sizeof(enc) - 1);
cur[sizeof(enc) - 1] = '\0';
/* make sure chars are with {' ' .. '~'}, and not '[' ']' */
for (cur = strncpy(enc, addr, sizeof(enc)); *cur != '\0'; ++cur)
for (; *cur != '\0'; ++cur)
if (!isalnum(*cur)) {
*cur = 'A' + (*cur % ('Z' - 'A'));
} else

6
lib/mu-date.c
View File

@ -54,8 +54,10 @@ mu_date_str_s (const char* frm, time_t t)
g_warning ("conversion failed: %s", err->message);
g_error_free (err);
strcpy (buf, "<error>");
} else
strncpy (buf, conv, sizeof(buf));
} else {
strncpy (buf, conv, sizeof(buf)-1);
buf[sizeof(buf)-1] = '\0';
}
g_free (conv);
}

3
mu/mu-cmd-find.c
View File

@ -344,7 +344,8 @@ field_string_list (MuMsg *msg, MuMsgFieldId mfid)
str = mu_str_from_list (lst, ',');
if (str) {
strncpy (buf, str, sizeof(buf));
strncpy (buf, str, sizeof(buf)-1);
buf[sizeof(buf)-1]='\0';
g_free (str);
return buf;
}

3
mu/mu-cmd-server.c
View File

@ -1406,7 +1406,8 @@ get_path_from_docid (MuStore *store, unsigned docid, GError **err)
return NULL;
}
strncpy (path, msgpath, sizeof(path));
strncpy (path, msgpath, sizeof(path) - 1);
path[sizeof(path)-1] = '\0';
mu_msg_unref (msg);
return path;