mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Fix port/enum values SizeOf
not being a count
Really, they both should be count. But, they were getting provided as an integer. Port is easy since it is backed by an unsigned value. Enums *should* be unsigned, but aren't. This doesn't address that, it just takes the other name for this operator (absolute value) and makes the enum value positive if it's negative. This fixes a case where using the size of operator on enum/port values in certain contexts (like the default parameter of a struct) would cause an internal error.
This commit is contained in:
parent
ba91de59b0
commit
d3dd8a155d
4 changed files with 29 additions and 3 deletions
12
src/Val.cc
12
src/Val.cc
|
@ -594,7 +594,7 @@ void IntervalVal::ValDescribe(ODesc* d) const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ValPtr PortVal::SizeVal() const { return val_mgr->Int(uint_val); }
|
ValPtr PortVal::SizeVal() const { return val_mgr->Count(uint_val); }
|
||||||
|
|
||||||
uint32_t PortVal::Mask(uint32_t port_num, TransportProto port_type) {
|
uint32_t PortVal::Mask(uint32_t port_num, TransportProto port_type) {
|
||||||
// Note, for ICMP one-way connections:
|
// Note, for ICMP one-way connections:
|
||||||
|
@ -3133,7 +3133,15 @@ unsigned int RecordVal::ComputeFootprint(std::unordered_set<const Val*>* analyze
|
||||||
return fp;
|
return fp;
|
||||||
}
|
}
|
||||||
|
|
||||||
ValPtr EnumVal::SizeVal() const { return val_mgr->Int(AsInt()); }
|
ValPtr EnumVal::SizeVal() const {
|
||||||
|
// Negative enums are rejected at parse time, but not internally. Handle the
|
||||||
|
// negative case just like a signed integer, as that is an enum's underlying
|
||||||
|
// type.
|
||||||
|
if ( AsInt() < 0 )
|
||||||
|
return val_mgr->Count(-AsInt());
|
||||||
|
else
|
||||||
|
return val_mgr->Count(AsInt());
|
||||||
|
}
|
||||||
|
|
||||||
void EnumVal::ValDescribe(ODesc* d) const {
|
void EnumVal::ValDescribe(ODesc* d) const {
|
||||||
const char* ename = type->AsEnumType()->Lookup(int_val);
|
const char* ename = type->AsEnumType()->Lookup(int_val);
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
||||||
expression warning in <...>/sizeof.zeek, line 73: count underflow (5 - 9)
|
expression warning in <...>/sizeof.zeek, line 83: count underflow (5 - 9)
|
||||||
|
|
|
@ -7,11 +7,13 @@ Expr: 18446744073709551612
|
||||||
Signed Expr: 4
|
Signed Expr: 4
|
||||||
Double -1.23: 1.230000
|
Double -1.23: 1.230000
|
||||||
Enum ENUM3: 2
|
Enum ENUM3: 2
|
||||||
|
Enum in record: 2 2
|
||||||
File 21.000000
|
File 21.000000
|
||||||
Function add_interface: 2
|
Function add_interface: 2
|
||||||
Integer -10: 10
|
Integer -10: 10
|
||||||
Interval -5.0 secs: 5.000000
|
Interval -5.0 secs: 5.000000
|
||||||
Port 80/tcp: 65616
|
Port 80/tcp: 65616
|
||||||
|
Port in record: 65616 65616
|
||||||
Record [i=10, j=<uninitialized>, k=<uninitialized>]: 3
|
Record [i=10, j=<uninitialized>, k=<uninitialized>]: 3
|
||||||
Set: 3
|
Set: 3
|
||||||
String 'Hello': 5
|
String 'Hello': 5
|
||||||
|
|
|
@ -20,6 +20,14 @@ type example_record: record {
|
||||||
k: int &optional;
|
k: int &optional;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type example_record_with_enum: record {
|
||||||
|
e: count &default = |ENUM3|;
|
||||||
|
} &redef;
|
||||||
|
|
||||||
|
type example_record_with_port: record {
|
||||||
|
p: count &default = |80/tcp|;
|
||||||
|
} &redef;
|
||||||
|
|
||||||
global a: addr = 1.2.3.4;
|
global a: addr = 1.2.3.4;
|
||||||
global a6: addr = [::1];
|
global a6: addr = [::1];
|
||||||
global b: bool = T;
|
global b: bool = T;
|
||||||
|
@ -36,6 +44,8 @@ global sn: subnet = 192.168.0.0/24;
|
||||||
global t: table[string] of string;
|
global t: table[string] of string;
|
||||||
global ti: time = current_time();
|
global ti: time = current_time();
|
||||||
global v: vector of string;
|
global v: vector of string;
|
||||||
|
global with_enum: example_record_with_enum;
|
||||||
|
global with_port: example_record_with_port;
|
||||||
|
|
||||||
# Additional initialization
|
# Additional initialization
|
||||||
#
|
#
|
||||||
|
@ -80,6 +90,9 @@ print fmt("Double %s: %f", d, |d|);
|
||||||
# Size of enum: returns numeric value of enum constant.
|
# Size of enum: returns numeric value of enum constant.
|
||||||
print fmt("Enum %s: %d", ENUM3, |ENUM3|);
|
print fmt("Enum %s: %d", ENUM3, |ENUM3|);
|
||||||
|
|
||||||
|
# Within a record, enum sizeof should still be ok
|
||||||
|
print fmt("Enum in record: %d %d", with_enum$e, |with_enum$e|);
|
||||||
|
|
||||||
# Size of file: returns current file size.
|
# Size of file: returns current file size.
|
||||||
# Note that this is a double so that file sizes >> 4GB
|
# Note that this is a double so that file sizes >> 4GB
|
||||||
# can be expressed.
|
# can be expressed.
|
||||||
|
@ -97,6 +110,9 @@ print fmt("Interval %s: %f", iv, |iv|);
|
||||||
# Size of port: returns port number as a count.
|
# Size of port: returns port number as a count.
|
||||||
print fmt("Port %s: %d", p, |p|);
|
print fmt("Port %s: %d", p, |p|);
|
||||||
|
|
||||||
|
# Within a record, port sizeof should still be ok
|
||||||
|
print fmt("Port in record: %d %d", with_port$p, |with_port$p|);
|
||||||
|
|
||||||
# Size of record: returns number of fields (assigned + unassigned)
|
# Size of record: returns number of fields (assigned + unassigned)
|
||||||
print fmt("Record %s: %d", r, |r|);
|
print fmt("Record %s: %d", r, |r|);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue