Skip to content

Commit

Permalink
fix: correctly use setNull
Browse files Browse the repository at this point in the history 
see https://github.com/jeremylong/DependencyCheck/pull/5978\#discussion_r1385746530
  • Loading branch information
@jeremylong
jeremylong committed Nov 10, 2023
1 parent dd729d7 commit 0c973dd
Showing 1 changed file with 49 additions and 49 deletions.
98 changes: 49 additions & 49 deletions core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,22 +974,22 @@ private int updateOrInsertVulnerability(DefCveItem cve, String description) {
setUpdateColumn(callUpdate, 17, cvssv2.getCvssData().getAvailabilityImpact());
setUpdateColumn(callUpdate, 18, cvssv2.getCvssData().getVersion());
} else {
callUpdate.setNull(3, java.sql.Types.NULL);
callUpdate.setNull(4, java.sql.Types.NULL);
callUpdate.setNull(5, java.sql.Types.NULL);
callUpdate.setNull(6, java.sql.Types.NULL);
callUpdate.setNull(7, java.sql.Types.NULL);
callUpdate.setNull(8, java.sql.Types.NULL);
callUpdate.setNull(9, java.sql.Types.NULL);
callUpdate.setNull(10, java.sql.Types.NULL);
callUpdate.setNull(11, java.sql.Types.NULL);
callUpdate.setNull(12, java.sql.Types.NULL);
callUpdate.setNull(13, java.sql.Types.NULL);
callUpdate.setNull(14, java.sql.Types.NULL);
callUpdate.setNull(15, java.sql.Types.NULL);
callUpdate.setNull(16, java.sql.Types.NULL);
callUpdate.setNull(17, java.sql.Types.NULL);
callUpdate.setNull(18, java.sql.Types.NULL);
callUpdate.setNull(3, java.sql.Types.VARCHAR);
callUpdate.setNull(4, java.sql.Types.DOUBLE);
callUpdate.setNull(5, java.sql.Types.DOUBLE);
callUpdate.setNull(6, java.sql.Types.VARCHAR);
callUpdate.setNull(7, java.sql.Types.BOOLEAN);
callUpdate.setNull(8, java.sql.Types.BOOLEAN);
callUpdate.setNull(9, java.sql.Types.BOOLEAN);
callUpdate.setNull(10, java.sql.Types.BOOLEAN);
callUpdate.setNull(11, java.sql.Types.DOUBLE);
callUpdate.setNull(12, java.sql.Types.VARCHAR);
callUpdate.setNull(13, java.sql.Types.VARCHAR);
callUpdate.setNull(14, java.sql.Types.VARCHAR);
callUpdate.setNull(15, java.sql.Types.VARCHAR);
callUpdate.setNull(16, java.sql.Types.VARCHAR);
callUpdate.setNull(17, java.sql.Types.VARCHAR);
callUpdate.setNull(18, java.sql.Types.VARCHAR);
}
Optional<CvssV3> optCvssv30 = Optional.empty();
if (cve.getCve().getMetrics() != null && cve.getCve().getMetrics().getCvssMetricV30() != null) {
Expand Down Expand Up @@ -1021,19 +1021,19 @@ private int updateOrInsertVulnerability(DefCveItem cve, String description) {
setUpdateColumn(callUpdate, 30, cvssv3.getCvssData().getBaseSeverity());
setUpdateColumn(callUpdate, 31, cvssv3.getCvssData().getVersion());
} else {
callUpdate.setNull(19, java.sql.Types.NULL);
callUpdate.setNull(20, java.sql.Types.NULL);
callUpdate.setNull(21, java.sql.Types.NULL);
callUpdate.setNull(22, java.sql.Types.NULL);
callUpdate.setNull(23, java.sql.Types.NULL);
callUpdate.setNull(24, java.sql.Types.NULL);
callUpdate.setNull(25, java.sql.Types.NULL);
callUpdate.setNull(26, java.sql.Types.NULL);
callUpdate.setNull(27, java.sql.Types.NULL);
callUpdate.setNull(28, java.sql.Types.NULL);
callUpdate.setNull(29, java.sql.Types.NULL);
callUpdate.setNull(30, java.sql.Types.NULL);
callUpdate.setNull(31, java.sql.Types.NULL);
callUpdate.setNull(19, java.sql.Types.DOUBLE);
callUpdate.setNull(20, java.sql.Types.DOUBLE);
callUpdate.setNull(21, java.sql.Types.VARCHAR);
callUpdate.setNull(22, java.sql.Types.VARCHAR);
callUpdate.setNull(23, java.sql.Types.VARCHAR);
callUpdate.setNull(24, java.sql.Types.VARCHAR);
callUpdate.setNull(25, java.sql.Types.VARCHAR);
callUpdate.setNull(26, java.sql.Types.VARCHAR);
callUpdate.setNull(27, java.sql.Types.VARCHAR);
callUpdate.setNull(28, java.sql.Types.VARCHAR);
callUpdate.setNull(29, java.sql.Types.DOUBLE);
callUpdate.setNull(30, java.sql.Types.VARCHAR);
callUpdate.setNull(31, java.sql.Types.VARCHAR);
}
if (isOracle) {
try {
Expand Down Expand Up @@ -1593,127 +1593,127 @@ private void addNullableStringParameter(PreparedStatement ps, int pos, String va

private void setUpdateColumn(PreparedStatement ps, int i, Double value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.DOUBLE);
} else {
ps.setDouble(i, value);
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV2Data.AuthenticationType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV2Data.CiaType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV2Data.Version value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV2Data.AccessComplexityType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV2Data.AccessVectorType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, String value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value);
}
}

private void setUpdateColumn(PreparedStatement ps, int i, Boolean value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.BOOLEAN);
} else {
ps.setBoolean(i, value);
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.AttackVectorType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.AttackComplexityType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.PrivilegesRequiredType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.UserInteractionType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.ScopeType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.SeverityType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.CiaType value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
}

private void setUpdateColumn(PreparedStatement ps, int i, CvssV3Data.Version value) throws SQLException {
if (value == null) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
} else {
ps.setString(i, value.value());
}
Expand All @@ -1733,10 +1733,10 @@ private void setFloatValue(PreparedStatement ps, int i, Map<String, Object> prop
try {
ps.setFloat(i, Float.parseFloat(props.get(key).toString()));
} catch (NumberFormatException nfe) {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.FLOAT);
}
} else {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.FLOAT);
}
}

Expand All @@ -1753,7 +1753,7 @@ private void setStringValue(PreparedStatement ps, int i, Map<String, Object> pro
if (props != null && props.containsKey(key)) {
ps.setString(i, props.get(key).toString());
} else {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.VARCHAR);
}
}

Expand All @@ -1770,7 +1770,7 @@ private void setBooleanValue(PreparedStatement ps, int i, Map<String, Object> pr
if (props != null && props.containsKey(key)) {
ps.setBoolean(i, Boolean.parseBoolean(props.get(key).toString()));
} else {
ps.setNull(i, java.sql.Types.NULL);
ps.setNull(i, java.sql.Types.BOOLEAN);
}
}

Expand Down

0 comments on commit 0c973dd

Please sign in to comment.