Prevent NPEs in previous commit

css4j · Oct 17, 2023 · ca972f8 · ca972f8
1 parent d01cf66
commit ca972f8
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/...vg-transcoder/src/main/java/io/sf/carte/echosvg/transcoder/util/CSSTranscodingHelper.java b/...vg-transcoder/src/main/java/io/sf/carte/echosvg/transcoder/util/CSSTranscodingHelper.java
@@ -1138,22 +1138,25 @@ public boolean supports(SelectorList selectors) {
 			}
 
 			private boolean supports(Selector selector) {
-				switch (selector.getSelectorType()) {
-				case CHILD:
-				case DESCENDANT:
-				case DIRECT_ADJACENT:
-				case SUBSEQUENT_SIBLING:
-					CombinatorSelector combSel = (CombinatorSelector) selector;
-					return supports(combSel.getSelector()) && supports(combSel.getSecondSelector());
-				case CONDITIONAL:
-					ConditionalSelector condSel = (ConditionalSelector) selector;
-					return supports(condSel.getSimpleSelector())
-							&& supports(condSel.getCondition());
-				case COLUMN_COMBINATOR:
-					return false;
-				default:
-					return true;
+				if (selector != null) {
+					switch (selector.getSelectorType()) {
+					case CHILD:
+					case DESCENDANT:
+					case DIRECT_ADJACENT:
+					case SUBSEQUENT_SIBLING:
+						CombinatorSelector combSel = (CombinatorSelector) selector;
+						return supports(combSel.getSelector())
+								&& supports(combSel.getSecondSelector());
+					case CONDITIONAL:
+						ConditionalSelector condSel = (ConditionalSelector) selector;
+						return supports(condSel.getSimpleSelector())
+								&& supports(condSel.getCondition());
+					case COLUMN_COMBINATOR:
+						return false;
+					default:
+					}
 				}
+				return true;
 			}
 
 			private boolean supports(Condition condition) {
@@ -1164,7 +1167,8 @@ private boolean supports(Condition condition) {
 							&& supports(combCond.getSecondCondition());
 				case SELECTOR_ARGUMENT:
 					ArgumentCondition argCond = (ArgumentCondition) condition;
-					return supports(argCond.getSelectors());
+					SelectorList selist = argCond.getSelectors();
+					return selist == null || supports(selist);
 				default:
 					return true;
 				}