-
Notifications
You must be signed in to change notification settings - Fork 277
[TG-3912] Sanitize string_constraintt bounds #2489
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f01c03c
Fix string_constraintt bound values
16052f8
Move string_constraintt constructor to cpp
fdf14f5
Add invariants on the sign of string_constraintt bounds
d74672b
Use const references in string_constraintt
9449ac7
Encapsulate constraints for equals
e5e5e9e
remove unneeded NOLINT
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/*******************************************************************\ | ||
|
||
Module: String solver | ||
|
||
Author: Diffblue Ltd. | ||
|
||
\*******************************************************************/ | ||
|
||
#include "string_constraint.h" | ||
|
||
#include <solvers/sat/satcheck.h> | ||
#include <util/symbol_table.h> | ||
|
||
/// Runs a solver instance to verify whether an expression can only be | ||
// non-negative. | ||
/// \param expr: the expression to check for negativity | ||
/// \return true if `expr < 0` is unsatisfiable, false otherwise | ||
static bool cannot_be_neg(const exprt &expr) | ||
{ | ||
satcheck_no_simplifiert sat_check; | ||
symbol_tablet symbol_table; | ||
namespacet ns(symbol_table); | ||
boolbvt solver(ns, sat_check); | ||
const exprt zero = from_integer(0, expr.type()); | ||
const binary_relation_exprt non_neg(expr, ID_lt, zero); | ||
solver << non_neg; | ||
return solver() == decision_proceduret::resultt::D_UNSATISFIABLE; | ||
} | ||
|
||
string_constraintt::string_constraintt( | ||
const symbol_exprt &_univ_var, | ||
const exprt &lower_bound, | ||
const exprt &upper_bound, | ||
const exprt &body) | ||
: univ_var(_univ_var), | ||
lower_bound(lower_bound), | ||
upper_bound(upper_bound), | ||
body(body) | ||
{ | ||
INVARIANT( | ||
cannot_be_neg(lower_bound), | ||
"String constraints must have non-negative lower bound.\n" + | ||
lower_bound.pretty()); | ||
INVARIANT( | ||
cannot_be_neg(upper_bound), | ||
"String constraints must have non-negative upper bound.\n" + | ||
upper_bound.pretty()); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure this will always work with this empty symbol table?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we're not using anything outside of the expression we're evaluating, I think it's fine. But please tell me if you see a potential flaw.