Merge pull request #182 from Arkshine/fix/mysql-crash-amtl

Fix a mysql crash after CString -> ke::AString conversion
alliedmodders · Jan 18, 2015 · 252f191 · 252f191
2 parents 2e64e9f + c3e0753
commit 252f191
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/dlls/mysqlx/threading.cpp b/dlls/mysqlx/threading.cpp
@@ -567,7 +567,8 @@ void AtomicResult::CopyFrom(IResultSet *rs)
 		{
 			*m_Table[i] = rs->FieldNumToName(i);
 		} else {
-			m_Table[i] = new ke::AString(rs->FieldNumToName(i));
+			const char* string = rs->FieldNumToName(i);
+			m_Table[i] = new ke::AString(string ? string : "");
 		}
 	}
 
@@ -582,7 +583,8 @@ void AtomicResult::CopyFrom(IResultSet *rs)
 			{
 				*m_Table[idx] = row->GetString(i);
 			} else {
-				m_Table[idx] = new ke::AString(row->GetString(i));
+				const char* string = row->GetString(i);
+				m_Table[idx] = new ke::AString(string ? string : "");
 			}
 		}
 		rs->NextRow();