Skip to content

Commit c3cb6d4

Browse files
author
Vadim Bogulean
committed
fix: correct conditional logic for version search options
1 parent 816cd21 commit c3cb6d4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/common/search.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ def get_vuln_cpes(appctx: ApplicationContext, opts: SearchOptions, vulnerable: b
226226
)
227227
else:
228228
qry_ver_cond = expression.and_(
229-
text("ver_pad(:ver_start, 7) < ver_pad(coalesce(cve_cpe_config.version_le, 'zzzzzzz'), 7)"),
230-
text("ver_pad(:ver_start, 7) <= ver_pad(coalesce(cve_cpe_config.version_lt, 'zzzzzzz'), 7)"),
231-
text("ver_pad(:ver_start, 7) > ver_pad(coalesce(cve_cpe_config.version_ge, '0'), 7)"),
232-
text("ver_pad(:ver_start, 7) >= ver_pad(coalesce(cve_cpe_config.version_gt, '0'), 7)"),
229+
text("ver_pad(:ver_start, 7) <= ver_pad(coalesce(cve_cpe_config.version_le, 'zzzzzzz'), 7)"),
230+
text("ver_pad(:ver_start, 7) < ver_pad(coalesce(cve_cpe_config.version_lt, 'zzzzzzz'), 7)"),
231+
text("ver_pad(:ver_start, 7) >= ver_pad(coalesce(cve_cpe_config.version_ge, '0'), 7)"),
232+
text("ver_pad(:ver_start, 7) > ver_pad(coalesce(cve_cpe_config.version_gt, '0'), 7)"),
233233
expression.or_(
234234
cve_cpe_config.version == '*',
235235
text("ver_pad(coalesce(cve_cpe_config.version, '0'), 7) > ver_pad(:ver_start, 7)")
@@ -251,10 +251,10 @@ def get_vuln_cpes(appctx: ApplicationContext, opts: SearchOptions, vulnerable: b
251251
)
252252
else:
253253
qry_ver_cond = expression.and_(
254-
text("ver_pad(:ver_end, 7) < ver_pad(coalesce(cve_cpe_config.version_le, 'zzzzzzz'), 7)"),
255-
text("ver_pad(:ver_end, 7) <= ver_pad(coalesce(cve_cpe_config.version_lt, 'zzzzzzz'), 7)"),
256-
text("ver_pad(:ver_end, 7) > ver_pad(coalesce(cve_cpe_config.version_ge, '0'), 7)"),
257-
text("ver_pad(:ver_end, 7) >= ver_pad(coalesce(cve_cpe_config.version_gt, '0'), 7)"),
254+
text("ver_pad(:ver_end, 7) <= ver_pad(coalesce(cve_cpe_config.version_le, 'zzzzzzz'), 7)"),
255+
text("ver_pad(:ver_end, 7) < ver_pad(coalesce(cve_cpe_config.version_lt, 'zzzzzzz'), 7)"),
256+
text("ver_pad(:ver_end, 7) >= ver_pad(coalesce(cve_cpe_config.version_ge, '0'), 7)"),
257+
text("ver_pad(:ver_end, 7) > ver_pad(coalesce(cve_cpe_config.version_gt, '0'), 7)"),
258258
expression.or_(
259259
cve_cpe_config.version == '*',
260260
text("ver_pad(coalesce(cve_cpe_config.version, 'zzzzzzz'), 7) < ver_pad(:ver_end, 7)")

0 commit comments

Comments
 (0)