[Commits] [SCM] claws branch, master, updated. 3.14.1-133-g56a59eb

[wwp at claws-mail.org]

The branch, master has been updated
       via  56a59eb0338866210734c132044b7906976bd983 (commit)
       via  bcb8cb4e9d6c8e777fd43fbef905d11c1e0fbc23 (commit)
      from  650e162f0f6995a1cd6782fcf2ce9fa65410701a (commit)

Summary of changes:
 src/plugins/vcalendar/libical/libical/icalproperty.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 56a59eb0338866210734c132044b7906976bd983
Merge: bcb8cb4 650e162
Author: wwp <wwp at free.fr>
Date:   Sat Jan 14 08:37:04 2017 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit bcb8cb4e9d6c8e777fd43fbef905d11c1e0fbc23
Author: wwp <wwp at free.fr>
Date:   Sat Jan 14 08:34:57 2017 +0100

    Revert part of 3.14.1-128-g498b61c, fixing Coverity CID #1398594.
    Instead of really fixing the wrong call to g_strdup_printf, I prefer
    not touching libical code, we'll see later what to do w/ it.

diff --git a/src/plugins/vcalendar/libical/libical/icalproperty.c b/src/plugins/vcalendar/libical/libical/icalproperty.c
index 6faaf8a..855e24b 100644
--- a/src/plugins/vcalendar/libical/libical/icalproperty.c
+++ b/src/plugins/vcalendar/libical/libical/icalproperty.c
@@ -44,8 +44,8 @@
 #include <errno.h>
 #include <stdio.h> /* for printf */
 #include <stdarg.h> /* for va_list, va_start, etc. */
-
-#define BUF_SIZE 1024
+                                               
+#define TMP_BUF_SIZE 1024
 
 /* Private routines for icalproperty */
 void icalvalue_set_parent(icalvalue* value,
@@ -175,7 +175,7 @@ icalproperty_new_clone(icalproperty* prop)
 icalproperty* icalproperty_new_from_string(char* str)
 {
 
-    size_t buf_size = BUF_SIZE;
+    size_t buf_size = 1024;
     char* buf;
     char* buf_ptr;  
     icalproperty *prop;
@@ -279,7 +279,7 @@ icalproperty_as_ical_string (icalproperty* prop)
        the caller forgetting to free it */
 
     const char* property_name = 0; 
-    size_t buf_size = BUF_SIZE;
+    size_t buf_size = 1024;
     char* buf;
     char* buf_ptr;
     icalvalue* value;
@@ -381,10 +381,9 @@ icalproperty_as_ical_string (icalproperty* prop)
 	}
 
 	if (kind_string == 0 ) {
-	    char *temp;
-	    temp = g_strdup_printf(temp, "Got a parameter of unknown kind in %s property", property_name);
+	    char temp[TMP_BUF_SIZE];
+	    snprintf(temp, TMP_BUF_SIZE,"Got a parameter of unknown kind in %s property",property_name);
 	    icalerror_warn(temp);
-	    g_free(temp);
 	    continue;
 	}
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail