Tobias Jeger pushed to branch feature/HSTTWO-3851 at cms-community /
hippo-site-toolkit
Commits:
cc0c839a by Tobias Jeger at 2016-11-02T10:44:54+01:00
HSTTWO-3851 Guard viewport map parsing against too large numbers
- - - - -
1 changed file:
- api/src/main/java/org/hippoecm/hst/configuration/channel/Channel.java
Changes:
=====================================
api/src/main/java/org/hippoecm/hst/configuration/channel/Channel.java
=====================================
--- a/api/src/main/java/org/hippoecm/hst/configuration/channel/Channel.java
+++ b/api/src/main/java/org/hippoecm/hst/configuration/channel/Channel.java
@@ -26,8 +26,12 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class Channel implements Serializable {
+ private static final Logger log = LoggerFactory.getLogger(Channel.class);
private static final long serialVersionUID = 1L;
private static final Pattern VIEWPORT_PATTERN =
Pattern.compile("^([^:]+):(\\d+)(px)?$");
@@ -375,7 +379,11 @@ public class Channel implements Serializable {
for (String device : devices) {
final Matcher m = VIEWPORT_PATTERN.matcher(device);
if (m.matches()) {
- viewportMap.put(m.group(1), Integer.valueOf(m.group(2)));
+ try {
+ viewportMap.put(m.group(1), Integer.valueOf(m.group(2)));
+ } catch (NumberFormatException e) {
+ log.warn("Failed to parse Integer {}", m.group(2), e);
+ }
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/cc0c839ad2b08ad14caa4420647212059fe1b161
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
