diff options
| author | unknown <sanja@montyprogram.com> | 2012-09-29 16:01:24 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-09-29 16:01:24 +0300 |
| commit | ce8484548b2a1e55bb6e1f798732f7d3a0e0c30d (patch) | |
| tree | 648ddc720b972267884736ac16e97c5f830fde6d /storage/cassandra | |
| parent | 703d82c4ca62081cf1b890e56f6eac342b565b4c (diff) | |
| download | mariadb-git-ce8484548b2a1e55bb6e1f798732f7d3a0e0c30d.tar.gz | |
Fix of MDEV-565: Server crashes in ha_cassandra::write_row on inserting NULL into a dynamic column
Fixed incorrect initialization of variable which caused freeing memory by random address in case of error.
Diffstat (limited to 'storage/cassandra')
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index d5f63229512..990012760e3 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -12,6 +12,8 @@ SET(cassandra_sources gen-cpp/Cassandra.h) #INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS}) + +#INCLUDE_DIRECTORIES(AFTER /usr/local/include/thrift) INCLUDE_DIRECTORIES(AFTER /home/buildbot/build/thrift-inst/include/thrift/) # diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index 3b0db24cff0..3b0772fc3e1 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -1978,7 +1978,7 @@ int ha_cassandra::write_row(uchar *buf) { String valcol; DYNAMIC_ARRAY vals, names; - char *free_names; + char *free_names= NULL; int rc; DBUG_ASSERT(field_converters[i] == NULL); if (!(rc= read_dyncol(&vals, &names, &valcol, &free_names))) |