Merge branch 'master' into topic/jsiwek/faf-cleanup

CHANGES

@@ -1,4 +1,18 @@
 
+2.1-741 | 2013-06-07 17:28:50 -0700
+
+  * Fixing typo that could cause an assertion to falsely trigger.
+    (Robin Sommer)
+
+2.1-740 | 2013-06-07 16:37:32 -0700
+
+  * Fix for CMake 2.6.x. (Robin Sommer)
+
+2.1-738 | 2013-06-07 08:38:13 -0700
+
+  * Remove invalid free on non-allocated pointer in hash function
+    object. Addresses #1018. (Matthias Vallentin)
+
 2.1-736 | 2013-06-06 10:05:20 -0700
 
   * New "magic constants" @DIR and @FILENAME that expand to the

VERSION

@@ -1 +1 @@
-2.1-736
+2.1-741

aux/broctl

@@ -1 +1 @@
-Subproject commit a1aaa1608ef08761a211b1e251449d796ba5e4a0
+Subproject commit cf7a1ca56f2b20f777542d912de0a9c8fdb0655d

src/CMakeLists.txt

@@ -382,7 +382,8 @@ set(BRO_EXE bro
     CACHE STRING "Bro executable binary" FORCE)
 
 # Target to create all the autogenerated files.
-add_custom_target(generate_outputs DEPENDS ${bro_ALL_GENERATED_OUTPUTS})
+add_custom_target(generate_outputs)
+add_dependencies(generate_outputs ${bro_ALL_GENERATED_OUTPUTS})
 
 # Build __load__.bro files for plugins/*.bif.bro.
 bro_bif_create_loader(bif_loader_plugins ${CMAKE_BINARY_DIR}/scripts/base/bif/plugins)

src/H3.h

@@ -66,7 +66,6 @@ template<class T, int N> class H3 {
     T byte_lookup[N][H3_BYTE_RANGE];
 public:
     H3();
-    ~H3() { free(byte_lookup); }
     T operator()(const void* data, size_t size, size_t offset = 0) const
     {
 	const unsigned char *p = static_cast<const unsigned char*>(data);

src/analyzer/Tag.cc

@@ -24,7 +24,7 @@ Tag::Tag(type_t arg_type, subtype_t arg_subtype)
 
 Tag::Tag(EnumVal* arg_val)
 	{
-	assert(val);
+	assert(arg_val);
 
 	val = arg_val;
 	Ref(val);