numberZero
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
experimental
est31 2016-01-08 15:37:11 +01:00
parent 0bbbc6e13d
commit 57a461930b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/database-redis.cpp
View File

@ -92,7 +92,7 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
if (reply->type == REDIS_REPLY_ERROR) { if (reply->type == REDIS_REPLY_ERROR) {
warningstream << "saveBlock: saving block " << PP(pos) warningstream << "saveBlock: saving block " << PP(pos)
<< " failed: " << reply->str << std::endl; << " failed: " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply); freeReplyObject(reply);
return false; return false;
} }
@ -119,7 +119,7 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
return str; return str;
} }
case REDIS_REPLY_ERROR: { case REDIS_REPLY_ERROR: {
std::string errstr = reply->str; std::string errstr(reply->str, reply->len);
freeReplyObject(reply); freeReplyObject(reply);
errorstream << "loadBlock: loading block " << PP(pos) errorstream << "loadBlock: loading block " << PP(pos)
<< " failed: " << errstr << std::endl; << " failed: " << errstr << std::endl;
@ -134,7 +134,7 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
} }
errorstream << "loadBlock: loading block " << PP(pos) errorstream << "loadBlock: loading block " << PP(pos)
<< " returned invalid reply type " << reply->type << " returned invalid reply type " << reply->type
<< ": " << reply->str << std::endl; << ": " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply); freeReplyObject(reply);
throw FileNotGoodException(std::string( throw FileNotGoodException(std::string(
"Redis command 'HGET %s %s' gave invalid reply.")); "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); "Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
} else if (reply->type == REDIS_REPLY_ERROR) { } else if (reply->type == REDIS_REPLY_ERROR) {
warningstream << "deleteBlock: deleting block " << PP(pos) warningstream << "deleteBlock: deleting block " << PP(pos)
<< " failed: " << reply->str << std::endl; << " failed: " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply); freeReplyObject(reply);
return false; return false;
} }
@ -177,7 +177,8 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
break; break;
case REDIS_REPLY_ERROR: case REDIS_REPLY_ERROR:
throw FileNotGoodException(std::string( 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); freeReplyObject(reply);
} }