Fix a reference counting bug in ListVal ctor.

bro · Jun 25, 2014 · bfaa082 · bfaa082
1 parent f7c2c00
commit bfaa082
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/Type.cc b/src/Type.cc
@@ -1691,7 +1691,7 @@ void VectorType::Describe(ODesc* d) const
 	yield_type->Describe(d);
 	}
 
-BroType* base_type(TypeTag tag)
+BroType* base_type_no_ref(TypeTag tag)
 	{
 	static BroType* base_types[NUM_TYPES];
 
@@ -1707,7 +1707,7 @@ BroType* base_type(TypeTag tag)
 		base_types[t]->SetLocationInfo(&l);
 		}
 
-	return base_types[t]->Ref();
+	return base_types[t];
 	}
 
 

diff --git a/src/Type.h b/src/Type.h
@@ -613,7 +613,13 @@ extern OpaqueType* bloomfilter_type;
 extern OpaqueType* x509_opaque_type;
 
 // Returns the BRO basic (non-parameterized) type with the given type.
-extern BroType* base_type(TypeTag tag);
+// The reference count of the type is not increased.
+BroType* base_type_no_ref(TypeTag tag);
+
+// Returns the BRO basic (non-parameterized) type with the given type.
+// The caller assumes responsibility for a reference to the type.
+inline BroType* base_type(TypeTag tag)
+	{ return base_type_no_ref(tag)->Ref(); }
 
 // Returns the BRO basic error type.
 inline BroType* error_type()	{ return base_type(TYPE_ERROR); }

diff --git a/src/Val.cc b/src/Val.cc
@@ -1152,7 +1152,7 @@ bool PatternVal::DoUnserialize(UnserialInfo* info)
 	}
 
 ListVal::ListVal(TypeTag t)
-: Val(new TypeList(t == TYPE_ANY ? 0 : base_type(t)))
+: Val(new TypeList(t == TYPE_ANY ? 0 : base_type_no_ref(t)))
 	{
 	tag = t;
 	}