Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/jsiwek/gh-219'

Browse source 
* origin/topic/jsiwek/gh-219:
  GH-219: fix |x| operator int overflow / floating point type inconsistency
This commit is contained in:
Johanna Amann 2019-01-23 09:49:35 -08:00
commit 5f0562bb04
10 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.6-95 | 2019-01-23 09:49:35 -0800
* GH-219: fix |x| operator int overflow / floating point type inconsistency
(Jon Siwek, Corelight)
2.6-92 | 2019-01-22 08:53:36 -0800 2.6-92 | 2019-01-22 08:53:36 -0800
* GH-151: fix hash calculation for nested sets * GH-151: fix hash calculation for nested sets

2
VERSION
View file

@ -1 +1 @@
2.6-92 2.6-95

5
src/Expr.cc
View file

@ -1360,7 +1360,10 @@ SizeExpr::SizeExpr(Expr* arg_op) : UnaryExpr(EXPR_SIZE, arg_op)
if ( IsError() ) if ( IsError() )
return; return;
SetType(base_type(TYPE_COUNT)); if ( op->Type()->InternalType() == TYPE_INTERNAL_DOUBLE )
SetType(op->Type()->Ref());
else
SetType(base_type(TYPE_COUNT));
} }
Val* SizeExpr::Eval(Frame* f) const Val* SizeExpr::Eval(Frame* f) const

2
src/Val.cc
View file

@ -425,7 +425,7 @@ Val* Val::SizeVal() const
return val_mgr->GetCount(val.uint_val); return val_mgr->GetCount(val.uint_val);
case TYPE_INTERNAL_DOUBLE: case TYPE_INTERNAL_DOUBLE:
return new Val(fabs(val.double_val), TYPE_DOUBLE); return new Val(fabs(val.double_val), type->Tag());
case TYPE_INTERNAL_OTHER: case TYPE_INTERNAL_OTHER:
if ( type->Tag() == TYPE_FUNC ) if ( type->Tag() == TYPE_FUNC )

7
src/parse.y
View file

@ -728,7 +728,12 @@ expr:
| '|' expr '|' %prec '(' | '|' expr '|' %prec '('
{ {
set_location(@1, @3); set_location(@1, @3);
$$ = new SizeExpr($2); auto e = $2;
if ( IsIntegral(e->Type()->Tag()) )
e = new ArithCoerceExpr(e, TYPE_INT);
$$ = new SizeExpr(e);
} }
| expr TOK_AS type | expr TOK_AS type

1
testing/btest/Baseline/language.interval/out
View file

@ -15,6 +15,7 @@ add different time units (PASS)
subtract different time units (PASS) subtract different time units (PASS)
absolute value (PASS) absolute value (PASS)
absolute value (PASS) absolute value (PASS)
absolute value (PASS)
assignment operator (PASS) assignment operator (PASS)
assignment operator (PASS) assignment operator (PASS)
multiplication operator (PASS) multiplication operator (PASS)

1
testing/btest/Baseline/language.sizeof/output
View file

@ -2,6 +2,7 @@ IPv4 Address 1.2.3.4: 32
IPv6 Address ::1: 128 IPv6 Address ::1: 128
Boolean T: 1 Boolean T: 1
Count 10: 10 Count 10: 10
Expr: 4
Double -1.23: 1.230000 Double -1.23: 1.230000
Enum ENUM3: 2 Enum ENUM3: 2
File 21.000000 File 21.000000

5
testing/btest/language/interval.bro
View file

@ -70,8 +70,9 @@ event bro_init()
test_case( "compare different time units", in13 >= in35 ); test_case( "compare different time units", in13 >= in35 );
test_case( "add different time units", in13 + in14 == 4min ); test_case( "add different time units", in13 + in14 == 4min );
test_case( "subtract different time units", in24 - in23 == 0sec ); test_case( "subtract different time units", in24 - in23 == 0sec );
test_case( "absolute value", |in25| == 2.0*3600 ); test_case( "absolute value", |in25| == 2hr );
test_case( "absolute value", |in36| == 2.5*86400 ); test_case( "absolute value", |in36| == 2.5day );
test_case( "absolute value", |5sec - 9sec| == 4sec );
in34 += 2hr; in34 += 2hr;
test_case( "assignment operator", in34 == 122min ); test_case( "assignment operator", in34 == 122min );
in34 -= 2hr; in34 -= 2hr;

4
testing/btest/language/sizeof.bro
View file

@ -64,6 +64,10 @@ print fmt("Boolean %s: %d", b, |b|);
# Size of count: identity. # Size of count: identity.
print fmt("Count %s: %d", c, |c|); print fmt("Count %s: %d", c, |c|);
# Size of integral arithmetic expression should coerce to int before absolute
# value operation to help prevent common unsigned int overflow situations.
print fmt("Expr: %d", |5 - 9|);
# Size of double: returns absolute value. # Size of double: returns absolute value.
print fmt("Double %s: %f", d, |d|); print fmt("Double %s: %f", d, |d|);

2
testing/btest/language/time.bro
View file

@ -27,7 +27,7 @@ event bro_init()
test_case( "inequality", t1 != t3 ); test_case( "inequality", t1 != t3 );
test_case( "equality", t1 == t4 ); test_case( "equality", t1 == t4 );
test_case( "subtract time", t2 - t1 == 3sec); test_case( "subtract time", t2 - t1 == 3sec);
test_case( "size operator", |t5| == 1234567890.0 ); test_case( "size operator", |t5| == t5 );
} }