fix: implicit narrowing conversion in compound assignment

Solve the vulnerability raised by CodeQL scanning for the implicit narrowing conversion in compound assignment. ING-4370
halestudio · Jun 27, 2024 · bfedff0 · bfedff0
1 parent 39ae68e
commit bfedff0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/...c/eu/esdihumboldt/hale/common/instance/orient/storage/BrowseOrientInstanceCollection.java b/...c/eu/esdihumboldt/hale/common/instance/orient/storage/BrowseOrientInstanceCollection.java
@@ -228,7 +228,7 @@ public boolean hasSize() {
 	 */
 	@Override
 	public int size() {
-		int size = 0;
+		long size = 0;
 		DatabaseReference<ODatabaseDocumentTx> ref = database.openRead();
 		ODatabaseDocumentTx db = ref.getDatabase();
 		try {
@@ -244,7 +244,11 @@ public int size() {
 			ref.dispose();
 		}
 
-		return size;
+		if (size > Integer.MAX_VALUE) {
+			throw new IllegalArgumentException("The size exceeds the range of int.");
+		}
+
+		return (int) size;
 	}
 
 	/**

diff --git a/...dt.cst.functions.geometric/src/eu/esdihumboldt/cst/functions/geometric/CalculateArea.java b/...dt.cst.functions.geometric/src/eu/esdihumboldt/cst/functions/geometric/CalculateArea.java
@@ -19,9 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.ListMultimap;
 import org.locationtech.jts.geom.Geometry;
 
+import com.google.common.collect.ListMultimap;
+
 import eu.esdihumboldt.hale.common.align.model.impl.PropertyEntityDefinition;
 import eu.esdihumboldt.hale.common.align.transformation.engine.TransformationEngine;
 import eu.esdihumboldt.hale.common.align.transformation.function.PropertyValue;
@@ -74,7 +75,7 @@ protected Object evaluate(String transformationIdentifier, TransformationEngine
 
 		if (geoms.size() > 1) {
 
-			int area = 0;
+			double area = 0;
 
 			for (GeometryProperty<?> geoProp : geoms) {
 				area += geoProp.getGeometry().getArea();
@@ -93,7 +94,8 @@ protected Object evaluate(String transformationIdentifier, TransformationEngine
 			return geom.getArea();
 		}
 		else {
-			throw new TransformationException("Geometry for calculate area could not be retrieved.");
+			throw new TransformationException(
+					"Geometry for calculate area could not be retrieved.");
 		}
 
 	}

diff --git a/....cst.functions.geometric/src/eu/esdihumboldt/cst/functions/geometric/CalculateLength.java b/....cst.functions.geometric/src/eu/esdihumboldt/cst/functions/geometric/CalculateLength.java
@@ -19,9 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.ListMultimap;
 import org.locationtech.jts.geom.Geometry;
 
+import com.google.common.collect.ListMultimap;
+
 import eu.esdihumboldt.hale.common.align.model.impl.PropertyEntityDefinition;
 import eu.esdihumboldt.hale.common.align.transformation.engine.TransformationEngine;
 import eu.esdihumboldt.hale.common.align.transformation.function.PropertyValue;
@@ -39,9 +40,9 @@
  * 
  * @author Kevin Mais
  */
-public class CalculateLength extends
-		AbstractSingleTargetPropertyTransformation<TransformationEngine> implements
-		CalculateLengthFunction {
+public class CalculateLength
+		extends AbstractSingleTargetPropertyTransformation<TransformationEngine>
+		implements CalculateLengthFunction {
 
 	/**
 	 * @see eu.esdihumboldt.hale.common.align.transformation.function.impl.AbstractSingleTargetPropertyTransformation#evaluate(java.lang.String,
@@ -75,7 +76,7 @@ protected Object evaluate(String transformationIdentifier, TransformationEngine
 
 		if (geoms.size() > 1) {
 
-			int length = 0;
+			double length = 0;
 
 			for (GeometryProperty<?> geoProp : geoms) {
 				length += geoProp.getGeometry().getLength();