cve-check-tool: fix crash on exceptions

This fixes cve-check-tool crashes on exceptions.

(From OE-Core rev: 06bea09755ebda9bcfa49bf87249f80cb019157e)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Marko
2017-06-07 08:04:31 +02:00
committed by Richard Purdie
parent d31bc5c515
commit 5a9cc41a3b
2 changed files with 51 additions and 0 deletions

View File

@@ -11,6 +11,7 @@ SRC_URI = "https://github.com/ikeydoherty/${BPN}/releases/download/v${PV}/${BP}.
file://0001-print-progress-in-percent-when-downloading-CVE-db.patch \
file://0001-curl-allow-overriding-default-CA-certificate-file.patch \
file://0001-update-Compare-computed-vs-expected-sha256-digit-str.patch \
file://0001-Fix-freeing-memory-allocated-by-sqlite.patch \
"
SRC_URI[md5sum] = "c5f4247140fc9be3bf41491d31a34155"

View File

@@ -0,0 +1,50 @@
From a3353429652f83bb8b0316500faa88fa2555542d Mon Sep 17 00:00:00 2001
From: Peter Marko <peter.marko@siemens.com>
Date: Thu, 13 Apr 2017 23:09:52 +0200
Subject: [PATCH] Fix freeing memory allocated by sqlite
Upstream-Status: Backport
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
src/core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core.c b/src/core.c
index 6263031..6788f16 100644
--- a/src/core.c
+++ b/src/core.c
@@ -82,7 +82,7 @@ static bool ensure_table(CveDB *self)
rc = sqlite3_exec(self->db, query, NULL, NULL, &err);
if (rc != SQLITE_OK) {
fprintf(stderr, "ensure_table(): %s\n", err);
- free(err);
+ sqlite3_free(err);
return false;
}
@@ -91,7 +91,7 @@ static bool ensure_table(CveDB *self)
rc = sqlite3_exec(self->db, query, NULL, NULL, &err);
if (rc != SQLITE_OK) {
fprintf(stderr, "ensure_table(): %s\n", err);
- free(err);
+ sqlite3_free(err);
return false;
}
@@ -99,11 +99,11 @@ static bool ensure_table(CveDB *self)
rc = sqlite3_exec(self->db, query, NULL, NULL, &err);
if (rc != SQLITE_OK) {
fprintf(stderr, "ensure_table(): %s\n", err);
- free(err);
+ sqlite3_free(err);
return false;
}
if (err) {
- free(err);
+ sqlite3_free(err);
}
return true;
--
2.1.4