Index: lib/row.cpp
===================================================================
--- lib/row.cpp	(revision 1419)
+++ lib/row.cpp	(working copy)
@@ -47,7 +47,8 @@
 	data_.clear();
 	is_nulls_.clear();
 	initialized_ = true;
-	for (unsigned int i = 0; i < size(); i++) {
+	size_type sz = res_->num_fields();
+	for (unsigned int i = 0; i < sz; i++) {
 		data_.insert(data_.end(),
 				(d[i] ?  std::string(d[i], jj[i]) : std::string("NULL")));
 		is_nulls_.insert(is_nulls_.end(), d[i] ? false : true);
@@ -65,7 +66,7 @@
 
 Row::size_type Row::size() const
 {
-	return res_->num_fields();
+	return data_.size();
 }
 
 const ColData Row::at(size_type i) const