diff --git a/CHANGES b/CHANGES index a86f463a4d..5788c8e7ca 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +4.1.0-dev.814 | 2021-06-28 11:06:39 -0700 + + * Check for -1 return from FieldOffset() in Val::HasField() + + Fixes Coverity 1457804 (Tim Wojtulewicz, Corelight) + 4.1.0-dev.812 | 2021-06-28 11:02:46 -0700 * whoops overlooked the need to canonicalize filenames (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index 179bf71ece..ea5d4b4783 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.812 +4.1.0-dev.814 diff --git a/src/Val.h b/src/Val.h index db14ecadd0..4b958b360d 100644 --- a/src/Val.h +++ b/src/Val.h @@ -1218,7 +1218,7 @@ public: bool HasField(const char *field) const { int idx = GetType()->AsRecordType()->FieldOffset(field); - return HasField(idx); + return (idx != -1) && HasField(idx); } /**