diff --git a/cwe-map.csv b/cwe-map.csv
index 479f1802..038e5656 100644
--- a/cwe-map.csv
+++ b/cwe-map.csv
@@ -36,6 +36,7 @@
 "COMPILER_WARNING","warning[-Waddress-of-packed-member]","CWE-465"
 "COMPILER_WARNING","warning[-Walloc-size-larger-than]","CWE-789"
 "COMPILER_WARNING","warning[-Warray-bounds]","CWE-788"
+"COMPILER_WARNING","warning[-Warray-compare]","CWE-595"
 "COMPILER_WARNING","warning[-Warray-parameter]","CWE-1228"
 "COMPILER_WARNING","warning[-Wattribute-warning]","CWE-9001"
 "COMPILER_WARNING","warning[-Wattributes]","CWE-9001"
@@ -50,6 +51,7 @@
 "COMPILER_WARNING","warning[-Wclobbered]","CWE-758"
 "COMPILER_WARNING","warning[-Wcomment]","CWE-9001"
 "COMPILER_WARNING","warning[-Wdangling-else]","CWE-691"
+"COMPILER_WARNING","warning[-Wdangling-pointers]","CWE-825"
 "COMPILER_WARNING","warning[-Wdeprecated]","CWE-477"
 "COMPILER_WARNING","warning[-Wdeprecated-copy-dtor]","CWE-477"
 "COMPILER_WARNING","warning[-Wdeprecated-copy]","CWE-477"
@@ -73,6 +75,7 @@
 "COMPILER_WARNING","warning[-Wimplicit-function-declaration]","CWE-686"
 "COMPILER_WARNING","warning[-Wimplicit-int]","CWE-573"
 "COMPILER_WARNING","warning[-Wincompatible-pointer-types]","CWE-843"
+"COMPILER_WARNING","warning[-Winfinite-recursion]","CWE-674"
 "COMPILER_WARNING","warning[-Winline]","CWE-9001"
 "COMPILER_WARNING","warning[-Wint-conversion]","CWE-704"
 "COMPILER_WARNING","warning[-Wint-in-bool-context]","CWE-670"
@@ -300,17 +303,36 @@
 "FORWARD_NULL","unbox_null","CWE-476"
 "FORWARD_NULL","var_deref_model","CWE-476"
 "FORWARD_NULL","var_deref_op","CWE-476"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-allocation-size]","CWE-131"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-deref-before-check]","CWE-465"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-double-fclose]","CWE-910"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-double-free]","CWE-415"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-fd-double-close]","CWE-1341"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-fd-leak]","CWE-775"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-fd-use-after-close]","CWE-910"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-file-leak]","CWE-775"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-free-of-non-heap]","CWE-590"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-infinite-recursion]","CWE-"674
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-jump-through-null]","CWE-476"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-malloc-leak]","CWE-401"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-mismatching-deallocation]","CWE-762"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-null-argument]","CWE-688"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-null-dereference]","CWE-476"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-possible-null-argument]","CWE-688"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-possible-null-dereference]","CWE-476"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-putenv-of-auto-var]","CWE-686"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-shift-count-negative]","CWE-1335"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-shift-count-overflow]","CWE-1335"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-unsafe-call-within-signal-handler]","CWE-479"
 "GCC_ANALYZER_WARNING","warning[-Wanalyzer-use-after-free]","CWE-416"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-use-of-pointer-in-stale-stack-frame]","CWE-825"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-use-of-uninitialized-value]","CWE-457"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-va-arg-type-mismatch]","CWE-686"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-va-list-exhausted]","CWE-685"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-va-list-leak]","CWE-404"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-va-list-use-after-va-end]","CWE-672"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-write-to-const]","CWE-471"
+"GCC_ANALYZER_WARNING","warning[-Wanalyzer-write-to-string-literal]","CWE-471"
 "GITLEAKS_WARNING","error[too-many]","CWE-540"
 "GITLEAKS_WARNING","warning[aws-access-token]","CWE-540"
 "GITLEAKS_WARNING","warning[gcp-api-key]","CWE-540"