[Commits] [SCM] claws branch, master, updated. 3.11.1-32-gdbedfb9

[ticho at claws-mail.org]

The branch, master has been updated
       via  dbedfb9340ffe9a76c2ab6ba3f26c244df00fb54 (commit)
       via  23c0630c1c263783d9a4657bb64ad81fc6d86b05 (commit)
      from  491667f21ad76f34145ac78e7682f115763fe1e0 (commit)

Summary of changes:
 src/plugins/rssyl/rssyl_add_item.c |    4 ++--
 src/plugins/rssyl/strutils.c       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit dbedfb9340ffe9a76c2ab6ba3f26c244df00fb54
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 27 02:12:42 2014 +0100

    RSSyl: Do not run html entity replacement on URL and item id strings when adding an item.

diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index b022271..bfb531c 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -314,11 +314,11 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
 	feed_item_set_title(feed_item, rssyl_format_string(feed_item_get_title(feed_item), TRUE, TRUE));
 	debug_print("RSSyl: fixing up URL\n");
 	feed_item_set_url(feed_item, rssyl_format_string(feed_item_get_url(feed_item),
-				TRUE, TRUE));
+				FALSE, TRUE));
 	if( feed_item_get_id(feed_item) != NULL ) {
 		debug_print("RSSyl: fixing up ID\n");
 		feed_item_set_id(feed_item, rssyl_format_string(feed_item_get_id(feed_item),
-					TRUE, TRUE));
+					FALSE, TRUE));
 	}
 
 	/* If there's a summary, but no text, use summary as text. */

commit 23c0630c1c263783d9a4657bb64ad81fc6d86b05
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 27 02:12:06 2014 +0100

    RSSyl: Fix allocated buffer size in previous commit to include space for terminating null byte; Fix minor logic bug.

diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index b2704d9..bfeef34 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -152,7 +152,7 @@ static RSSyl_HTMLSymbol tag_list[] = {
 
 static gchar *rssyl_replace_chrefs(gchar *string)
 {
-	char *new = g_malloc0(strlen(string)), *ret;
+	char *new = g_malloc0(strlen(string) + 1), *ret;
 	char buf[16], tmp[6];
 	int i, ii, j, n, len;
 	gunichar c;
@@ -165,7 +165,7 @@ static gchar *rssyl_replace_chrefs(gchar *string)
 			j = i+1;
 			n = 0;
 			valid = FALSE;
-			while (string[j] != '\0' && j < 16) {
+			while (string[j] != '\0' && n < 16) {
 				if (string[j] != ';') {
 					buf[n++] = string[j];
 				} else {

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


hooks/post-receive
-- 
Claws Mail