[Commits] [SCM] claws branch, master, updated. 3.12.0-109-g0bc73a0
Colin
colin at claws-mail.org
Thu Oct 8 19:06:04 CEST 2015
The branch, master has been updated
via 0bc73a08fc82333fd27730cf721d5c6e2593f68e (commit)
via 9af27fcb9c07d0118dd1986a23a9d04b3c5acc71 (commit)
via ae5935f8ea97c2fecbc95149b96377f71d8cb802 (commit)
via accc3f6a7b0793a41e08603b4d89a47aaf644050 (commit)
via 9dbc2cbc465e7873ab75be7227764b5901928227 (commit)
via 6fcc0e06c5bf6c0a2a49784d54a4e1a5e6a0a5dd (commit)
via 985a56cfaf5bc19be9a31f9fda2e647a966bea91 (commit)
from e61a8b585e007c7a542dd11a851d79650590c38f (commit)
Summary of changes:
src/plugins/archive/libarchive_archive.c | 2 +-
src/plugins/clamd/libclamd/clamd-plugin.c | 1 +
src/plugins/notification/notification_core.c | 8 ++++----
src/plugins/notification/notification_pixbuf.c | 2 ++
src/plugins/vcalendar/libical/libical/icalcomponent.c | 2 +-
src/plugins/vcalendar/libical/libical/icalmime.c | 2 +-
src/plugins/vcalendar/libical/libical/icaltime.h | 1 -
7 files changed, 10 insertions(+), 8 deletions(-)
- Log -----------------------------------------------------------------
commit 0bc73a08fc82333fd27730cf721d5c6e2593f68e
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 19:03:00 2015 +0200
Fix possibly non-null-terminated string
diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c
index d4a3c94..b50fb90 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.c
+++ b/src/plugins/clamd/libclamd/clamd-plugin.c
@@ -369,6 +369,7 @@ Clamd_Stat clamd_init(Clamd_Socket* config) {
}
memset(buf, '\0', sizeof(buf));
while ((n_read = read(sock, buf, BUFSIZ)) > 0) {
+ buf[n_read] = '\0';
if (buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = '\0';
debug_print("Ping result: %s\n", buf);
commit 9af27fcb9c07d0118dd1986a23a9d04b3c5acc71
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 18:59:49 2015 +0200
Fix TOCTOU (time-to-check, time-to-use) race
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 928c8eb..f0ae67b 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -551,11 +551,11 @@ const gchar* archive_create(const char* archive_name, GSList* files,
g_free(msg);
#endif
entry = archive_entry_new();
- lstat(filename, &st);
if ((fd = open(filename, O_RDONLY)) == -1) {
perror("open file");
}
else {
+ lstat(filename, &st);
archive_entry_copy_stat(entry, &st);
archive_entry_set_pathname(entry, filename);
if (S_ISLNK(st.st_mode)) {
commit ae5935f8ea97c2fecbc95149b96377f71d8cb802
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 18:58:54 2015 +0200
Fix possible overrun
diff --git a/src/plugins/vcalendar/libical/libical/icalmime.c b/src/plugins/vcalendar/libical/libical/icalmime.c
index 1eeff36..2ed9bac 100644
--- a/src/plugins/vcalendar/libical/libical/icalmime.c
+++ b/src/plugins/vcalendar/libical/libical/icalmime.c
@@ -234,7 +234,7 @@ line between the header and the previous boundary\?";
snprintf((char*)temp,256,
"%s: %s",str,parts[i].header.error_text);
} else {
- strcpy((char*)temp,str);
+ strncpy((char*)temp,str, 255);
}
icalcomponent_add_property
commit accc3f6a7b0793a41e08603b4d89a47aaf644050
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 18:49:45 2015 +0200
Fix wrong variable in for loop
diff --git a/src/plugins/vcalendar/libical/libical/icalcomponent.c b/src/plugins/vcalendar/libical/libical/icalcomponent.c
index 26754b2..b723086 100644
--- a/src/plugins/vcalendar/libical/libical/icalcomponent.c
+++ b/src/plugins/vcalendar/libical/libical/icalcomponent.c
@@ -1082,7 +1082,7 @@ icalcomponent_begin_component(icalcomponent* component,icalcomponent_kind kind)
icalerror_check_arg_re( (component!=0),"component",icalcompiter_null);
- for( i = pvl_head(impl->components); i != 0; i = pvl_next(itr.iter)) {
+ for( i = pvl_head(impl->components); i != 0; i = pvl_next(i)) {
icalcomponent *c = (icalcomponent*) pvl_data(i);
commit 9dbc2cbc465e7873ab75be7227764b5901928227
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 18:47:24 2015 +0200
Remove unused field
diff --git a/src/plugins/vcalendar/libical/libical/icaltime.h b/src/plugins/vcalendar/libical/libical/icaltime.h
index 0f0379b..5bfb3c1 100644
--- a/src/plugins/vcalendar/libical/libical/icaltime.h
+++ b/src/plugins/vcalendar/libical/libical/icaltime.h
@@ -52,7 +52,6 @@ struct icaltimetype
int is_date; /* 1 -> interpret this as date. */
- const char* zone; /*Ptr to Olsen placename. Libical does not own mem*/
};
/* Convert seconds past UNIX epoch to a timetype*/
commit 6fcc0e06c5bf6c0a2a49784d54a4e1a5e6a0a5dd
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 18:39:33 2015 +0200
Fix theoretical off-by-one (which should never happen)
diff --git a/src/plugins/notification/notification_pixbuf.c b/src/plugins/notification/notification_pixbuf.c
index c14ce24..22984fe 100644
--- a/src/plugins/notification/notification_pixbuf.c
+++ b/src/plugins/notification/notification_pixbuf.c
@@ -16,6 +16,7 @@
*/
#include "notification_pixbuf.h"
+#include "common/utils.h"
/* The following files were created from the respective .png or
* xpm files with the command
@@ -81,6 +82,7 @@ GdkPixbuf* notification_pixbuf_get(NotificationPixbuf wanted)
break;
}
}
+ cm_return_val_if_fail(wanted < NOTIFICATION_PIXBUF_LAST, NULL);
return notification_pixbuf[wanted];
}
commit 985a56cfaf5bc19be9a31f9fda2e647a966bea91
Author: Colin Leroy <colin at colino.net>
Date: Thu Oct 8 18:34:00 2015 +0200
Fix off-by-one.
diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c
index 69bdf31..22fb659 100644
--- a/src/plugins/notification/notification_core.c
+++ b/src/plugins/notification/notification_core.c
@@ -653,22 +653,22 @@ gchar* notification_libnotify_sanitize_str(gchar *in)
i_out = 0;
while(*in) {
if(*in == '<') {
- if(i_out+3 >= STR_MAX_LEN) break;
+ if(i_out+3 > STR_MAX_LEN) break;
memcpy(&(tmp_str[i_out]),"<",4);
in++; i_out += 4;
}
else if(*in == '>') {
- if(i_out+3 >= STR_MAX_LEN) break;
+ if(i_out+3 > STR_MAX_LEN) break;
memcpy(&(tmp_str[i_out]),">",4);
in++; i_out += 4;
}
else if(*in == '&') {
- if(i_out+4 >= STR_MAX_LEN) break;
+ if(i_out+4 > STR_MAX_LEN) break;
memcpy(&(tmp_str[i_out]),"&",5);
in++; i_out += 5;
}
else {
- if(i_out >= STR_MAX_LEN) break;
+ if(i_out > STR_MAX_LEN) break;
tmp_str[i_out++] = *in++;
}
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list