Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix type narrowing on a couple of subtractions

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-03-24 13:06:33 -07:00
parent 499729bd8e
commit f2a6ad63ed
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Expr.cc
View file

@ -2660,12 +2660,12 @@ IntrusivePtr<Val> IndexExpr::Fold(Val* v1, Val* v2) const
v = {NewRef{}, vect->Lookup(v2)}; v = {NewRef{}, vect->Lookup(v2)};
else else
{ {
int len = vect->Size(); size_t len = vect->Size();
auto result = make_intrusive<VectorVal>(vect->Type()->AsVectorType()); auto result = make_intrusive<VectorVal>(vect->Type()->AsVectorType());
bro_int_t first = get_slice_index(lv->Index(0)->CoerceToInt(), len); bro_int_t first = get_slice_index(lv->Index(0)->CoerceToInt(), len);
bro_int_t last = get_slice_index(lv->Index(1)->CoerceToInt(), len); bro_int_t last = get_slice_index(lv->Index(1)->CoerceToInt(), len);
int sub_length = last - first; bro_int_t sub_length = last - first;
if ( sub_length >= 0 ) if ( sub_length >= 0 )
{ {
@ -2708,7 +2708,7 @@ IntrusivePtr<Val> IndexExpr::Fold(Val* v1, Val* v2) const
{ {
bro_int_t first = get_slice_index(lv->Index(0)->AsInt(), len); bro_int_t first = get_slice_index(lv->Index(0)->AsInt(), len);
bro_int_t last = get_slice_index(lv->Index(1)->AsInt(), len); bro_int_t last = get_slice_index(lv->Index(1)->AsInt(), len);
int substring_len = last - first; bro_int_t substring_len = last - first;
if ( substring_len < 0 ) if ( substring_len < 0 )
substring = 0; substring = 0;