SVN: security/cve_reader.py

[shadzik]

Author: shadzik
Date: Fri May 23 21:45:38 2008
New Revision: 9765

Modified:
   security/cve_reader.py
Log:
- this time it really fixes that issue (tested)
- thx arekm and glen


Modified: security/cve_reader.py
==============================================================================
--- security/cve_reader.py	(original)
+++ security/cve_reader.py	Fri May 23 21:45:38 2008
@@ -107,12 +107,12 @@
 							foundrange = 0
 					else:
 						# Check if in added line exists some CVE note and it's not a patch that was removed
-						if re.match('^\+.*(CVE-[0-9\-]+)', lines[i+cvslog]) and re.match('!^\+.*(CVE-[0-9\-]+)\.patch', lines[i+cvslog]) and re.match('!^\+.*(CVE-[0-9\-]+)\.diff', lines[i+cvslog]):
+						if re.match('^\+.*(CVE-[0-9\-]+)', lines[i+cvslog]):
 							if foundrange == 1:
 								foundcveafterrange = 1
 							
 							# Good, found CVE entries. Extract them!
-							cve_list = re.findall("CVE-[0-9\-]+", lines[i+cvslog])
+							cve_list = re.findall("CVE-[0-9]{4}-[0-9]{4}(?!\.diff|\.patch)", lines[i+cvslog])
 							for iter in range(len(cve_list)):
 								cve.append(cve_list[iter])