diff --git a/CHANGES b/CHANGES index 102ae700a1..7e031b009a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4.1.0-dev.118 | 2021-01-18 19:14:30 -0700 + + * Remove superfluous nullptr checks in Val/RecordVal methods (Jon Siwek, Corelight) 4.1.0-dev.116 | 2021-01-14 19:29:58 -0800 diff --git a/VERSION b/VERSION index e4e80ee1be..9ca7005dcc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.116 +4.1.0-dev.118 diff --git a/src/Val.h b/src/Val.h index d72550b3ff..5b9405ecfb 100644 --- a/src/Val.h +++ b/src/Val.h @@ -213,12 +213,7 @@ UNDERLYING_ACCESSOR_DECL(TypeVal, zeek::Type*, AsType) { // Since we're converting from "this", make sure the type requested is a pointer. static_assert(std::is_pointer()); - - auto v = static_cast(this); - if ( ! v ) - reporter->InternalError("Failed dynamic_cast between Val types"); - - return v; + return static_cast(this); } protected: @@ -1262,9 +1257,6 @@ public: { auto& field_ptr = GetField(field); auto field_val_ptr = static_cast(field_ptr.get()); - if ( ! field_val_ptr ) - reporter->InternalError("Typecast failed in TableVal::GetFieldAs"); - return field_val_ptr->Get(); } @@ -1273,9 +1265,6 @@ public: { auto& field_ptr = GetField(field); auto field_val_ptr = static_cast(field_ptr.get()); - if ( ! field_val_ptr ) - reporter->InternalError("Typecast failed in TableVal::GetFieldAs"); - return field_val_ptr->Get(); }