From 1890a5f0b0259127572d186f2779c5c4480bc130 Mon Sep 17 00:00:00 2001
From: Michael Penick <michael.penick@datastax.com>
Date: Mon, 23 May 2016 08:35:39 -0700
Subject: [PATCH] Fix: Adding valid data type to null values caused segfault in
 metadata

- Adding a data type to "null" values (commit:
  bf2d53f3542fcdbb41d9cff113b8c56d9931cd10) changed an assumption about
  how a "null" (or valid) values could be determined.
---
 src/metadata.cpp |  3 ++-
 src/value.cpp    | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/metadata.cpp b/src/metadata.cpp
index c03416994..eba16739a 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -997,10 +997,11 @@ const Value* MetadataBase::add_field(const SharedRefPtr<RefBuffer>& buffer, cons
   if (value == NULL) return NULL;
   if (value->size() <= 0) {
     fields_[name] = MetadataField(name);
+    return NULL; // Return NULL for "null" columns
   } else {
     fields_[name] = MetadataField(name, *value, buffer);
+    return value;
   }
-  return value;
 }
 
 void MetadataBase::add_field(const SharedRefPtr<RefBuffer>& buffer, const Value& value, const std::string& name) {
diff --git a/src/value.cpp b/src/value.cpp
index bb7c43609..55bba4758 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -210,21 +210,22 @@ Value::Value(int protocol_version,
 }
 
 bool Value::as_bool() const {
-  assert(value_type() == CASS_VALUE_TYPE_BOOLEAN);
+  assert(!is_null() && value_type() == CASS_VALUE_TYPE_BOOLEAN);
   uint8_t value;
   decode_byte(data_, value);
   return value != 0;
 }
 
 int32_t Value::as_int32() const {
-  assert(value_type() == CASS_VALUE_TYPE_INT);
+  assert(!is_null() && value_type() == CASS_VALUE_TYPE_INT);
   int32_t value;
   decode_int32(data_, value);
   return value;
 }
 
 CassUuid Value::as_uuid() const {
-  assert(value_type() == CASS_VALUE_TYPE_UUID || value_type() == CASS_VALUE_TYPE_TIMEUUID);
+  assert(!is_null() && (value_type() == CASS_VALUE_TYPE_UUID ||
+                        value_type() == CASS_VALUE_TYPE_TIMEUUID));
   CassUuid value;
   decode_uuid(data_, &value);
   return value;
@@ -232,7 +233,8 @@ CassUuid Value::as_uuid() const {
 }
 
 StringVec Value::as_stringlist() const {
-  assert((value_type() == CASS_VALUE_TYPE_LIST || value_type() == CASS_VALUE_TYPE_SET) &&
+  assert(!is_null() && (value_type() == CASS_VALUE_TYPE_LIST ||
+                        value_type() == CASS_VALUE_TYPE_SET) &&
          primary_value_type() == CASS_VALUE_TYPE_VARCHAR);
   StringVec stringlist;
   CollectionIterator iterator(this);