[Commits] [SCM] claws branch, master, updated. 3.10.1-114-g175213a

[ticho at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  175213a5326a1f14b21f8b6aee89d55f086eca59 (commit)
       via  1316680290aea575cbc04e664b51457b82aff506 (commit)
       via  5d65cf9f805b141f4862a7b9ffea427c64b32da0 (commit)
      from  3abe2e6d328a1b890475391fd0f5c31869eb3ea5 (commit)

Summary of changes:
 src/plugins/rssyl/libfeed/feed.h          |    2 +-
 src/plugins/rssyl/libfeed/parser_atom10.c |    2 ++
 src/plugins/rssyl/libfeed/parser_rdf.c    |    2 ++
 src/plugins/rssyl/rssyl_deleted.c         |    1 +
 4 files changed, 6 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 175213a5326a1f14b21f8b6aee89d55f086eca59
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Sun Jun 29 21:26:48 2014 +0200

    RSSyl: make sure we do not operate with NULL text in libfeed parsers' end-handlers.

diff --git a/src/plugins/rssyl/libfeed/parser_atom10.c b/src/plugins/rssyl/libfeed/parser_atom10.c
index 59fba1c..2285477 100644
--- a/src/plugins/rssyl/libfeed/parser_atom10.c
+++ b/src/plugins/rssyl/libfeed/parser_atom10.c
@@ -93,6 +93,8 @@ void feed_parser_atom10_end(void *data, const gchar *el)
 
 	if( ctx->str != NULL )
 		text = ctx->str->str;
+	else
+		text = "";
 
 	ctx->depth--;
 
diff --git a/src/plugins/rssyl/libfeed/parser_rdf.c b/src/plugins/rssyl/libfeed/parser_rdf.c
index dc424c5..f469e06 100644
--- a/src/plugins/rssyl/libfeed/parser_rdf.c
+++ b/src/plugins/rssyl/libfeed/parser_rdf.c
@@ -56,6 +56,8 @@ void feed_parser_rdf_end(void *data, const gchar *el)
 
 	if( ctx->str != NULL )
 		text = ctx->str->str;
+	else
+		text = "";
 
 	ctx->depth--;
 	

commit 1316680290aea575cbc04e664b51457b82aff506
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Sun Jun 29 21:23:23 2014 +0200

    RSSyl: make the libfeed parsers' FILL macro brace-safe. Thanks Colin!

diff --git a/src/plugins/rssyl/libfeed/feed.h b/src/plugins/rssyl/libfeed/feed.h
index dc8847d..5960133 100644
--- a/src/plugins/rssyl/libfeed/feed.h
+++ b/src/plugins/rssyl/libfeed/feed.h
@@ -107,7 +107,7 @@ gboolean feed_insert_item(Feed *feed, FeedItem *item, gint pos);
 
 guint feed_update(Feed *feed, time_t last_update);
 
-#define FILL(n)		g_free(n); n = g_strdup(text);
+#define FILL(n)		{ g_free(n); n = g_strdup(text); } while(0);
 
 #include "feeditem.h"
 

commit 5d65cf9f805b141f4862a7b9ffea427c64b32da0
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Sun Jun 29 21:20:15 2014 +0200

    RSSyl: fix memory leak in rssyl_deleted

diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index 2d39adb..d77c0b0 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -225,6 +225,7 @@ void rssyl_deleted_add(RFolderItem *ritem, gchar *path)
 	g_free(deleted_file);
 
 	rssyl_deleted_free(deleted_items);
+	feed_item_free(fitem);
 }
 
 static gint _rssyl_deleted_check_func(gconstpointer a, gconstpointer b)

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


hooks/post-receive
-- 
Claws Mail