From 2b9f19aafdf23af9bc54740d2a2d57f6c57c9d0a Mon Sep 17 00:00:00 2001
From: Prabhu Subramanian <prabhu@appthreat.com>
Date: Thu, 13 Jun 2024 21:10:09 +0100
Subject: [PATCH] Bug fix

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
---
 vdb/lib/aqua.py | 26 ++++++++++++++++++++++----
 vdb/lib/gha.py  |  2 ++
 vdb/lib/npm.py  |  2 ++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/vdb/lib/aqua.py b/vdb/lib/aqua.py
index 076f2ea..1777a09 100644
--- a/vdb/lib/aqua.py
+++ b/vdb/lib/aqua.py
@@ -210,8 +210,9 @@ def alsa_to_vuln(cve_data):
             )
             try:
                 vuln = NvdSource.convert_vuln(orjson.loads(tdata))
-                vuln.description = compress_str(description)
-                ret_data.append(vuln)
+                if vuln:
+                    vuln.description = compress_str(description)
+                    ret_data.append(vuln)
             except Exception:
                 pass
         return ret_data
@@ -293,6 +294,8 @@ def alas_rlsa_to_vuln(cve_data, vendor):
                 )
                 try:
                     vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                    if vuln is None:
+                        continue
                     vuln.description = compress_str(description)
                     ret_data.append(vuln)
                     done_pkgs[pkg_key] = True
@@ -396,6 +399,8 @@ def ubuntu_to_vuln(cve_data):
                         )
                         try:
                             vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                            if vuln is None:
+                                continue
                             vuln.description = compress_str(description)
                             ret_data.append(vuln)
                         except Exception:
@@ -507,6 +512,8 @@ def redhat_to_vuln(cve_data):
                 )
                 try:
                     vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                    if vuln is None:
+                        continue
                     vuln.description = compress_str(description)
                     ret_data.append(vuln)
                     done_pkgs[pkg_key] = True
@@ -573,6 +580,8 @@ def arch_to_vuln(cve_data):
                 )
                 try:
                     vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                    if vuln is None:
+                        continue
                     vuln.description = compress_str(description)
                     ret_data.append(vuln)
                 except Exception:
@@ -671,6 +680,8 @@ def suse_to_vuln(self, cve_data):
                         )
                         try:
                             vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                            if vuln is None:
+                                continue
                             vuln.description = compress_str(description)
                             ret_data.append(vuln)
                             done_pkgs[pkg_key] = True
@@ -741,8 +752,9 @@ def photon_to_vuln(cve_data):
             )
             try:
                 vuln = NvdSource.convert_vuln(orjson.loads(tdata))
-                vuln.description = compress_str(description)
-                ret_data.append(vuln)
+                if vuln:
+                    vuln.description = compress_str(description)
+                    ret_data.append(vuln)
             except Exception:
                 pass
         return ret_data
@@ -859,6 +871,8 @@ def debian_to_vuln(cve_data):
                 )
                 try:
                     vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                    if vuln is None:
+                        continue
                     vuln.description = compress_str(description)
                     ret_data.append(vuln)
                 except Exception:
@@ -924,6 +938,8 @@ def wolfi_to_vuln(cve_data):
                 )
                 try:
                     vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                    if vuln is None:
+                        continue
                     vuln.description = f"""URL Prefix: {cve_data.get("urlprefix")}. Affected arch: {", ".join(cve_data.get("archs"))}"""
                     ret_data.append(vuln)
                 except Exception:
@@ -978,6 +994,8 @@ def alpine_to_vuln(cve_data):
             )
             try:
                 vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                if vuln is None:
+                    continue
                 vuln.description = f"{cve_id} is unfixed in {edition}. Visit https://security.alpinelinux.org/vuln/{cve_id} for more details."
                 ret_data.append(vuln)
             except Exception:
diff --git a/vdb/lib/gha.py b/vdb/lib/gha.py
index df3e695..5da0b60 100755
--- a/vdb/lib/gha.py
+++ b/vdb/lib/gha.py
@@ -280,6 +280,8 @@ def convert(self, cve_data):
                 try:
                     tdata_json = orjson.loads(tdata)
                     vuln = NvdSource.convert_vuln(tdata_json)
+                    if vuln is None:
+                        continue
                     vuln.description = compress_str(description)
                     ret_data.append(vuln)
                 except Exception as e:
diff --git a/vdb/lib/npm.py b/vdb/lib/npm.py
index d08ae61..3290b82 100644
--- a/vdb/lib/npm.py
+++ b/vdb/lib/npm.py
@@ -277,6 +277,8 @@ def to_vuln(self, v, ret_data):
                 )
                 try:
                     vuln = NvdSource.convert_vuln(orjson.loads(tdata))
+                    if vuln is None:
+                        continue
                     vuln.description = compress_str(description)
                     ret_data.append([vuln, f"""{v["id"]}|{product}|{used_version}"""])
                 except Exception as e: