Skip to content

Commit f9bc21d

Browse files
committed
Merge branch 'main' into shims-for-java89-compat
Signed-off-by: Mike Samuel <[email protected]>
2 parents f1af803 + 032d11b commit f9bc21d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssSchema.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,10 @@ Property forKey(String propertyName) {
472472
Set<String> whiteSpaceLiterals0 = j8().setOf(
473473
"-moz-pre-wrap", "-o-pre-wrap", "-pre-wrap", "nowrap", "pre",
474474
"pre-line", "pre-wrap");
475+
Set<String> wordBreakLiterals0 = j8().setOf(
476+
"break-all", "break-word", "keep-all", "normal");
475477
Set<String> wordWrapLiterals0 = j8().setOf(
476-
"break-word", "normal");
478+
"anywhere", "break-word", "normal");
477479
Set<String> rgb$FunLiterals0 = j8().setOf(",");
478480
Set<String> linearGradient$FunLiterals0 = j8().setOf(
479481
",", "to");
@@ -483,7 +485,7 @@ Property forKey(String propertyName) {
483485
Set<String> radialGradient$FunLiterals1 = j8().setOf(
484486
",", "center", "circle");
485487
Set<String> rect$FunLiterals0 = j8().setOf(",", "auto");
486-
//Set<String> alpha$FunLiterals0 = j8().setOf("=", "opacity");
488+
//Set<String> alpha$FunLiterals0 = j8().setOf("=", "opacity");
487489
Property mozBorderRadius =
488490
new Property(5, mozBorderRadiusLiterals0, zeroFns);
489491
builder.put("-moz-border-radius", mozBorderRadius);
@@ -747,6 +749,7 @@ Property forKey(String propertyName) {
747749
Property whiteSpace = new Property(
748750
0, union(fontStyleLiterals0, whiteSpaceLiterals0), zeroFns);
749751
builder.put("white-space", whiteSpace);
752+
builder.put("word-break", new Property(0, wordBreakLiterals0, zeroFns));
750753
builder.put("word-wrap", new Property(0, wordWrapLiterals0, zeroFns));
751754
builder.put("zoom", new Property(1, fontStretchLiterals1, zeroFns));
752755
Property rgb$Fun = new Property(1, rgb$FunLiterals0, zeroFns);

0 commit comments

Comments
 (0)