GP-5136 Changed SARIF export to only include defined-components when

outputing a structure definition

Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/IsfComposite.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,17 +27,13 @@ public class IsfComposite extends AbstractIsfObject {
 	public String kind;
 	public Integer size;
 	public JsonObject fields;
-	
+
 	public IsfComposite(Composite composite, IsfDataTypeWriter writer, TaskMonitor monitor) {
 		super(composite);
-		size = composite.getLength();
+		size = composite.isZeroLength() ? 0 : composite.getLength();
 		kind = composite instanceof Structure ? "struct" : "union";
 
-		DataTypeComponent[] components = composite.getComponents();
-		if (components.length == 0) {
-			// NB: composite.getLength always returns > 0
-			size = 0;
-		}
+		DataTypeComponent[] components = composite.getDefinedComponents();
 		fields = new JsonObject();
 		for (DataTypeComponent component : components) {
 			if (monitor.isCancelled()) {