Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-13 11:15:27 +00:00
Code Issues Releases Activity

Expand several buffers identified by cppcheck

Browse Source 
I ran cppcheck on a whim while trying to debug #103 and it found these possible
memory corruptions. They all seem to be buffers that were made one byte too
small (leaving out the byte for the C-string null terminator).
This commit is contained in:
Brian De Wolf 2015-11-01 19:37:24 -08:00
parent 3414955ad6
commit 1dd6a47c24
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/linux.cc
View File

@ -144,7 +144,7 @@ int check_mount(struct text_object *obj)
return 0; return 0;
if ((mtab = fopen("/etc/mtab", "r"))) { if ((mtab = fopen("/etc/mtab", "r"))) {
char buf1[256], buf2[128]; char buf1[256], buf2[129];
while (fgets(buf1, 256, mtab)) { while (fgets(buf1, 256, mtab)) {
sscanf(buf1, "%*s %128s", buf2); sscanf(buf1, "%*s %128s", buf2);
@ -593,7 +593,7 @@ int update_net_stats(void)
#ifdef BUILD_IPV6 #ifdef BUILD_IPV6
FILE *file; FILE *file;
char v6addr[32]; char v6addr[33];
char devname[21]; char devname[21];
unsigned int netmask, scope; unsigned int netmask, scope;
struct net_stat *ns; struct net_stat *ns;
@ -1905,7 +1905,7 @@ void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item)
int present_rate = -1; int present_rate = -1;
int remaining_capacity = -1; int remaining_capacity = -1;
char charging_state[64]; char charging_state[64];
char present[4]; char present[5];
/* read last full capacity if it's zero */ /* read last full capacity if it's zero */
if (acpi_last_full[idx] == 0) { if (acpi_last_full[idx] == 0) {

6
src/mail.cc
View File

@ -514,9 +514,9 @@ std::unique_ptr<mail_param_ex> parse_mail_args(mail_type type, const char *arg)
std::unique_ptr<mail_param_ex> mail; std::unique_ptr<mail_param_ex> mail;
char *tmp; char *tmp;
char host[128]; char host[129];
char user[128]; char user[129];
char pass[128]; char pass[129];
if (sscanf(arg, "%128s %128s %128s", host, user, pass) if (sscanf(arg, "%128s %128s %128s", host, user, pass)
!= 3) { != 3) {