Fix SEGV and tests.

Bram Veldhoen
1 parent 46b0d40d
Showing 2 changed files with 7 additions and 2 deletions
src/command.cpp
test/test.cpp
@@ -167,7 +167,11 @@ template&lt;class ReplyT&gt;
 bool Command<ReplyT>::checkErrorReply() {
   if (reply_obj_->type == REDIS_REPLY_ERROR) {
-    last_error_ = reply_obj_->str;
+    if (0 != reply_obj_->str)
+    {
+      last_error_ = reply_obj_->str;
+    }
+
     logger_.error() << cmd() << ": " << last_error_;
     reply_status_ = ERROR_REPLY;
     return true;
@@ -51,7 +51,6 @@ protected:
   virtual ~RedoxTest()
   {
-    rdx.disconnect();
   }
   // CV and counter to wait for async commands to complete
@@ -218,6 +217,7 @@ TEST_F(RedoxTest, Loop) {
 }
 TEST_F(RedoxTest, GetSetError) {
+  connect();
   rdx.command<string>({"SET", "redox_test:a", "apple"}, print_and_check<string>("OK"));
   rdx.command<int>({"GET", "redox_test:a"},  print_and_check_error<int>(3));
   wait_for_replies();
@@ -253,6 +253,7 @@ TEST_F(RedoxTest, IncrSync) {
 }
 TEST_F(RedoxTest, GetSetSyncError) {
+  connect();
   print_and_check_sync<string>(rdx.commandSync<string>({"SET", "redox_test:a", "apple"}), "OK");
   print_and_check_error_sync<int>(rdx.commandSync<int>({"GET", "redox_test:a"}), 3);
   rdx.disconnect();