aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2016-01-08 15:37:11 +0100
committerest31 <MTest31@outlook.com>2016-01-08 15:37:11 +0100
commit57a461930ba13b0b499c334d77e4b6a0aa73606b (patch)
tree1b7f9fe43f55b1fea78f64af794b2c5d00ef8374 /src
parent0bbbc6e13dc8180cf1d98f9866bc72a510162eb3 (diff)
downloadminetest-57a461930ba13b0b499c334d77e4b6a0aa73606b.tar.gz
minetest-57a461930ba13b0b499c334d77e4b6a0aa73606b.tar.bz2
minetest-57a461930ba13b0b499c334d77e4b6a0aa73606b.zip
Fix redis error reporting
Previously, we assumed that reply->str was NULL terminated. However, this turned out to be not true, as users reported crashes in strlen connected to where reply->str was appended to an std::string. Use the method recomended by the docs, to read the length separately.
Diffstat (limited to 'src')
-rw-r--r--src/database-redis.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index 196d72f25..498e9d39a 100644
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -92,7 +92,7 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
if (reply->type == REDIS_REPLY_ERROR) {
warningstream << "saveBlock: saving block " << PP(pos)
- << " failed: " << reply->str << std::endl;
+ << " failed: " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply);
return false;
}
@@ -119,7 +119,7 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
return str;
}
case REDIS_REPLY_ERROR: {
- std::string errstr = reply->str;
+ std::string errstr(reply->str, reply->len);
freeReplyObject(reply);
errorstream << "loadBlock: loading block " << PP(pos)
<< " failed: " << errstr << std::endl;
@@ -134,7 +134,7 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
}
errorstream << "loadBlock: loading block " << PP(pos)
<< " returned invalid reply type " << reply->type
- << ": " << reply->str << std::endl;
+ << ": " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply);
throw FileNotGoodException(std::string(
"Redis command 'HGET %s %s' gave invalid reply."));
@@ -151,7 +151,7 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
"Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
} else if (reply->type == REDIS_REPLY_ERROR) {
warningstream << "deleteBlock: deleting block " << PP(pos)
- << " failed: " << reply->str << std::endl;
+ << " failed: " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply);
return false;
}
@@ -177,7 +177,8 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
break;
case REDIS_REPLY_ERROR:
throw FileNotGoodException(std::string(
- "Failed to get keys from database: ") + reply->str);
+ "Failed to get keys from database: ") +
+ std::string(reply->str, reply->len));
}
freeReplyObject(reply);
}