From d1f72ee53a5ac2da2dc50690b12135c4518e0483 Mon Sep 17 00:00:00 2001 From: Athou Date: Fri, 16 Aug 2013 16:31:43 +0200 Subject: [PATCH] if we fail to parse the rule, return an empty rule instead --- .../com/commafeed/backend/feeds/FeedUtils.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java index b55e1a38..19b495aa 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java @@ -211,9 +211,10 @@ public class FeedUtils { } public static String escapeIFrameCss(String orig) { - List rules = Lists.newArrayList(); + String rule = ""; CSSOMParser parser = new CSSOMParser(); try { + List rules = Lists.newArrayList(); CSSStyleDeclaration decl = parser.parseStyleDeclaration(new InputSource(new StringReader(orig))); for (int i = 0; i < decl.getLength(); i++) { @@ -227,16 +228,18 @@ public class FeedUtils { rules.add(property + ":" + decl.getPropertyValue(property) + ";"); } } - } catch (IOException e) { + rule = StringUtils.join(rules, ""); + } catch (Exception e) { log.error(e.getMessage(), e); } - return StringUtils.join(rules, ""); + return rule; } public static String escapeImgCss(String orig) { - List rules = Lists.newArrayList(); + String rule = ""; CSSOMParser parser = new CSSOMParser(); try { + List rules = Lists.newArrayList(); CSSStyleDeclaration decl = parser.parseStyleDeclaration(new InputSource(new StringReader(orig))); for (int i = 0; i < decl.getLength(); i++) { @@ -250,10 +253,11 @@ public class FeedUtils { rules.add(property + ":" + decl.getPropertyValue(property) + ";"); } } - } catch (IOException e) { + rule = StringUtils.join(rules, ""); + } catch (Exception e) { log.error(e.getMessage(), e); } - return StringUtils.join(rules, ""); + return rule; } public static boolean isRTL(FeedEntry entry) {