[Commits] [SCM] claws branch, master, updated. 3.13.2-7-g543c7d3

[ticho at claws-mail.org]

The branch, master has been updated
       via  543c7d33942ec31d4f81af6ecc0aa2aa28e85e7c (commit)
      from  b3b2d2c84562912a3402eaea449587d6fa6fd647 (commit)

Summary of changes:
 src/plugins/rssyl/libfeed/feed.c          |    5 +++
 src/plugins/rssyl/libfeed/feed.h          |    1 +
 src/plugins/rssyl/libfeed/parser_atom10.c |   52 +++++++++++++++++++++++++----
 3 files changed, 51 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 543c7d33942ec31d4f81af6ecc0aa2aa28e85e7c
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jan 27 16:54:07 2016 +0100

    RSSyl: Handle XHTML content correctly for Atom feeds.
    
    Fixes bug #3603.

diff --git a/src/plugins/rssyl/libfeed/feed.c b/src/plugins/rssyl/libfeed/feed.c
index b4db22e..fc16889 100644
--- a/src/plugins/rssyl/libfeed/feed.c
+++ b/src/plugins/rssyl/libfeed/feed.c
@@ -267,6 +267,7 @@ guint feed_update(Feed *feed, time_t last_update)
 	feed_ctx->parser = XML_ParserCreate(NULL);
 	feed_ctx->depth = 0;
 	feed_ctx->str = NULL;
+	feed_ctx->xhtml_str = NULL;
 	feed_ctx->feed = feed;
 	feed_ctx->location = 0;
 	feed_ctx->curitem = NULL;
@@ -348,6 +349,10 @@ cleanup:
 	XML_ParserFree(feed_ctx->parser);
 	g_free(feed_ctx->name);
 	g_free(feed_ctx->mail);
+	if (feed_ctx->str != NULL);
+		g_string_free(feed_ctx->str, TRUE);
+	if (feed_ctx->xhtml_str != NULL);
+		g_string_free(feed_ctx->xhtml_str, TRUE);
 	g_free(feed_ctx);
 
 	return response_code;
diff --git a/src/plugins/rssyl/libfeed/feed.h b/src/plugins/rssyl/libfeed/feed.h
index 18c1801..e2acd8f 100644
--- a/src/plugins/rssyl/libfeed/feed.h
+++ b/src/plugins/rssyl/libfeed/feed.h
@@ -68,6 +68,7 @@ struct _FeedParserCtx {
 	guint depth;
 	guint location;
 	GString *str;
+	GString *xhtml_str;
 	gchar *name;
 	gchar *mail;
 	gboolean id_is_permalink;
diff --git a/src/plugins/rssyl/libfeed/parser_atom10.c b/src/plugins/rssyl/libfeed/parser_atom10.c
index f2afa3f..0ede945 100644
--- a/src/plugins/rssyl/libfeed/parser_atom10.c
+++ b/src/plugins/rssyl/libfeed/parser_atom10.c
@@ -99,14 +99,29 @@ void feed_parser_atom10_start(void *data, const gchar *el, const gchar **attr)
 			else
 				ctx->curitem->title_format = FEED_ITEM_TITLE_UNKNOWN;
 		} else if (!strcmp(el, "content") && ctx->curitem != NULL) {
+			ctx->location = FEED_LOC_ATOM10_CONTENT;
 			a = feed_parser_get_attribute_value(attr, "type");
 			if (a && !strcmp(a, "xhtml")) {
 				ctx->curitem->xhtml_content = TRUE;
-				ctx->location = FEED_LOC_ATOM10_CONTENT;
+				ctx->xhtml_str = g_string_new(NULL);
 			}
 		}
+	} else if (ctx->depth >= 3) {
+		if (ctx->curitem->xhtml_content
+				&& ctx->location == FEED_LOC_ATOM10_CONTENT) {
+			guint i;
+			GString *txt = ctx->xhtml_str;
+			g_string_append_c(txt, '<');
+			g_string_append(txt, el);
+
+			for (i = 0; attr[i] != NULL && attr[i+1] != NULL; i += 2) {
+				g_string_append_printf(txt, " %s='%s'", attr[i], attr[i+1]);
+			}
+			g_string_append_c(txt, '>');
+		}
 	}
 
+
 	ctx->depth++;
 }
 
@@ -188,9 +203,6 @@ void feed_parser_atom10_end(void *data, const gchar *el)
 						FILL(ctx->curitem->title)
 					} else if( !strcmp(el, "summary") ) {
 						FILL(ctx->curitem->summary)
-					} else if( !strcmp(el, "content") ) {
-						if (!ctx->curitem->xhtml_content)
-							FILL(ctx->curitem->text)
 					} else if( !strcmp(el, "id") ) {
 						FILL(ctx->curitem->id)
 						feed_item_set_id_permalink(ctx->curitem, TRUE);
@@ -218,8 +230,24 @@ void feed_parser_atom10_end(void *data, const gchar *el)
 					}
 
 					break;
-			}
 
+				case FEED_LOC_ATOM10_CONTENT:
+					if( !strcmp(el, "content") ) {
+						if (ctx->curitem->xhtml_content) {
+							/* Just in case the <content> tag itself also has some
+							 * content of its own, not just the <div> it should,
+							 * let's append it to the end. */
+							g_string_append(ctx->xhtml_str, text);
+							ctx->curitem->text = g_string_free(ctx->xhtml_str, FALSE);
+							ctx->xhtml_str = NULL;
+						} else {
+							FILL(ctx->curitem->text)
+						}
+						ctx->location = FEED_LOC_ATOM10_ENTRY;
+					}
+
+					break;
+			}
 			break;
 
 		case 4:
@@ -252,14 +280,24 @@ void feed_parser_atom10_end(void *data, const gchar *el)
 					break;
 
 				case FEED_LOC_ATOM10_CONTENT:
-					if (!strcmp(el, "div") && ctx->curitem->xhtml_content)
-						FILL(ctx->curitem->text)
+					if (ctx->curitem->xhtml_content) {
+						g_string_append(ctx->xhtml_str, text);
+						g_string_append_printf(ctx->xhtml_str, "</%s>", el);
+					}
 					break;
 
 				}
 
 
 			break;
+
+		default:
+			if (ctx->location == FEED_LOC_ATOM10_CONTENT
+					&& ctx->curitem->xhtml_content) {
+				g_string_append(ctx->xhtml_str, text);
+				g_string_append_printf(ctx->xhtml_str, "</%s>", el);
+			}
+			break;
 	}
 
 	if( ctx->str != NULL ) {

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


hooks/post-receive
-- 
Claws Mail