Throw inside Buffer constructor instead

Author: accelerated

Diff for: include/cppkafka/buffer.h

@@ -35,6 +35,7 @@
 #include <iosfwd>
 #include <algorithm>
 #include "macros.h"
+#include "exceptions.h"
 
 namespace cppkafka {
 
@@ -86,6 +87,10 @@ class CPPKAFKA_API Buffer {
     Buffer(const std::vector<T>& data)
     : data_(data.data()), size_(data.size()) {
         static_assert(sizeof(T) == sizeof(DataType), "sizeof(T) != sizeof(DataType)");
+        if (((data_ == nullptr) && (size_ > 0)) ||
+            ((data_ != nullptr) && (size_ == 0))) {
+            throw Exception("Invalid buffer configuration");
+        }
     }
 
     // Don't allow construction from temporary vectors

Diff for: src/buffer.cpp

@@ -67,11 +67,11 @@ Buffer::const_iterator Buffer::end() const {
 }
 
 Buffer::operator bool() const {
-    return (data_ != nullptr) && (size_ != 0);
+    return size_ != 0;
 }
 
 Buffer::operator string() const {
-    return (bool)(*this) ? string(data_, data_ + size_) : string();
+    return string(data_, data_ + size_);
 }
 
 ostream& operator<<(ostream& output, const Buffer& rhs) {