Merge pull request #2035 from 0intro/coverity-incorrect-expressions-20230920

Fix incorrect expressions reported by Coverity

Author: jan-cerny

src/OVAL/probes/SEAP/generic/strto.c

@@ -74,7 +74,7 @@ int64_t strto_int64 (const char *str, size_t len, char **endptr, int base)
 {
     int errno_copy = 0;
     int64_t result = 0;
-    char *null_str = calloc(len + 1, sizeof(str));
+    char *null_str = calloc(len + 1, sizeof(*str));
 
     memcpy(null_str, str, len);
     errno = 0;
@@ -90,7 +90,7 @@ uint64_t strto_uint64 (const char *str, size_t len, char **endptr, int base)
 {
     int errno_copy = 0;
     int64_t result = 0;
-    char *null_str = calloc(len + 1, sizeof(str));
+    char *null_str = calloc(len + 1, sizeof(*str));
 
     memcpy(null_str, str, len);
     errno = 0;
@@ -106,7 +106,7 @@ double strto_double (const char *str, size_t len, char **endptr)
 {
     int errno_copy = 0;
     int64_t result = 0;
-    char *null_str = calloc(len + 1, sizeof(str));
+    char *null_str = calloc(len + 1, sizeof(*str));
 
     memcpy(null_str, str, len);
     errno = 0;

src/OVAL/probes/independent/sql57_probe.c

@@ -482,7 +482,7 @@ int sql57_probe_main(probe_ctx *ctx, void *arg)
 	err = dbSQL_eval(engine, version, conn, sqlexp, ctx);
 __exit:
 	if (engine != NULL) {
-		__clearmem(conn, strlen(engine));
+		__clearmem(engine, strlen(engine));
 		free(engine);
 	}
 

src/OVAL/probes/independent/sql_probe.c

@@ -427,7 +427,7 @@ int sql_probe_main(probe_ctx *ctx, void *arg)
 	err = dbSQL_eval(engine, version, conn, sqlexp, ctx);
 __exit:
 	if (engine != NULL) {
-		__clearmem(conn, strlen(engine));
+		__clearmem(engine, strlen(engine));
 		free(engine);
 	}