Skip to content
Permalink
Browse files
Make sure relevant std::stringstreams are set to binary
  • Loading branch information
sfan5 committed Sep 11, 2021
1 parent 766e885 commit 75bf9b75caba5fc876f20eabea3fabc142d1b51e
@@ -1693,13 +1693,13 @@ float Client::mediaReceiveProgress()
return 1.0; // downloader only exists when not yet done
}

typedef struct TextureUpdateArgs {
struct TextureUpdateArgs {
gui::IGUIEnvironment *guienv;
u64 last_time_ms;
u16 last_percent;
const wchar_t* text_base;
ITextureSource *tsrc;
} TextureUpdateArgs;
};

void Client::showUpdateProgressTexture(void *args, u32 progress, u32 max_progress)
{
@@ -1718,8 +1718,8 @@ void Client::showUpdateProgressTexture(void *args, u32 progress, u32 max_progres

if (do_draw) {
targs->last_time_ms = time_ms;
std::basic_stringstream<wchar_t> strm;
strm << targs->text_base << " " << targs->last_percent << "%...";
std::wostringstream strm;
strm << targs->text_base << L" " << targs->last_percent << L"%...";
m_rendering_engine->draw_load_screen(strm.str(), targs->guienv, targs->tsrc, 0,
72 + (u16) ((18. / 100.) * (double) targs->last_percent), true);
}
@@ -1618,7 +1618,7 @@ bool Game::getServerContent(bool *aborted)
dtime, progress);
delete[] text;
} else {
std::stringstream message;
std::ostringstream message;
std::fixed(message);
message.precision(0);
float receive = client->mediaReceiveProgress() * 100;
@@ -70,11 +70,11 @@ bool Database_LevelDB::saveBlock(const v3s16 &pos, const std::string &data)

void Database_LevelDB::loadBlock(const v3s16 &pos, std::string *block)
{
std::string datastr;
leveldb::Status status = m_database->Get(leveldb::ReadOptions(),
i64tos(getBlockAsInteger(pos)), &datastr);
i64tos(getBlockAsInteger(pos)), block);

*block = (status.ok()) ? datastr : "";
if (!status.ok())
block->clear();
}

bool Database_LevelDB::deleteBlock(const v3s16 &pos)
@@ -131,7 +131,7 @@ void PlayerDatabaseLevelDB::savePlayer(RemotePlayer *player)
std::string (long) serialized_inventory
*/

std::ostringstream os;
std::ostringstream os(std::ios_base::binary);
writeU8(os, 1);

PlayerSAO *sao = player->getPlayerSAO();
@@ -142,7 +142,7 @@ void PlayerDatabaseLevelDB::savePlayer(RemotePlayer *player)
writeF32(os, sao->getRotation().Y);
writeU16(os, sao->getBreath());

StringMap stringvars = sao->getMeta().getStrings();
const auto &stringvars = sao->getMeta().getStrings();
writeU32(os, stringvars.size());
for (const auto &it : stringvars) {
os << serializeString16(it.first);
@@ -170,7 +170,7 @@ bool PlayerDatabaseLevelDB::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
player->getName(), &raw);
if (!s.ok())
return false;
std::istringstream is(raw);
std::istringstream is(raw, std::ios_base::binary);

if (readU8(is) > 1)
return false;
@@ -230,7 +230,7 @@ bool AuthDatabaseLevelDB::getAuth(const std::string &name, AuthEntry &res)
leveldb::Status s = m_database->Get(leveldb::ReadOptions(), name, &raw);
if (!s.ok())
return false;
std::istringstream is(raw);
std::istringstream is(raw, std::ios_base::binary);

/*
u8 version = 1
@@ -262,7 +262,7 @@ bool AuthDatabaseLevelDB::getAuth(const std::string &name, AuthEntry &res)

bool AuthDatabaseLevelDB::saveAuth(const AuthEntry &authEntry)
{
std::ostringstream os;
std::ostringstream os(std::ios_base::binary);
writeU8(os, 1);
os << serializeString16(authEntry.password);

@@ -274,10 +274,10 @@ void MapDatabasePostgreSQL::loadBlock(const v3s16 &pos, std::string *block)
PGresult *results = execPrepared("read_block", ARRLEN(args), args,
argLen, argFmt, false);

*block = "";

if (PQntuples(results))
*block = std::string(PQgetvalue(results, 0, 0), PQgetlength(results, 0, 0));
block->assign(PQgetvalue(results, 0, 0), PQgetlength(results, 0, 0));
else
block->clear();

PQclear(results);
}
@@ -496,6 +496,7 @@ void PlayerDatabasePostgreSQL::savePlayer(RemotePlayer *player)
execPrepared("remove_player_inventory_items", 1, rmvalues);

std::vector<const InventoryList*> inventory_lists = sao->getInventory()->getLists();
std::ostringstream oss;
for (u16 i = 0; i < inventory_lists.size(); i++) {
const InventoryList* list = inventory_lists[i];
const std::string &name = list->getName();
@@ -512,9 +513,10 @@ void PlayerDatabasePostgreSQL::savePlayer(RemotePlayer *player)
execPrepared("add_player_inventory", 5, inv_values);

for (u32 j = 0; j < list->getSize(); j++) {
std::ostringstream os;
list->getItem(j).serialize(os);
std::string itemStr = os.str(), slotId = itos(j);
oss.str("");
oss.clear();
list->getItem(j).serialize(oss);
std::string itemStr = oss.str(), slotId = itos(j);

const char* invitem_values[] = {
player->getName(),
@@ -127,8 +127,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)

switch (reply->type) {
case REDIS_REPLY_STRING: {
*block = std::string(reply->str, reply->len);
// std::string copies the memory so this won't cause any problems
block->assign(reply->str, reply->len);
freeReplyObject(reply);
return;
}
@@ -141,8 +140,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
"Redis command 'HGET %s %s' errored: ") + errstr);
}
case REDIS_REPLY_NIL: {
*block = "";
// block not found in database
block->clear();
freeReplyObject(reply);
return;
}
@@ -302,7 +302,10 @@ void MapDatabaseSQLite3::loadBlock(const v3s16 &pos, std::string *block)
const char *data = (const char *) sqlite3_column_blob(m_stmt_read, 0);
size_t len = sqlite3_column_bytes(m_stmt_read, 0);

*block = (data) ? std::string(data, len) : "";
if (data)
block->assign(data, len);
else
block->clear();

sqlite3_step(m_stmt_read);
// We should never get more than 1 row, so ok to reset
@@ -491,6 +494,7 @@ void PlayerDatabaseSQLite3::savePlayer(RemotePlayer *player)
sqlite3_reset(m_stmt_player_remove_inventory_items);

std::vector<const InventoryList*> inventory_lists = sao->getInventory()->getLists();
std::ostringstream oss;
for (u16 i = 0; i < inventory_lists.size(); i++) {
const InventoryList* list = inventory_lists[i];

@@ -503,9 +507,10 @@ void PlayerDatabaseSQLite3::savePlayer(RemotePlayer *player)
sqlite3_reset(m_stmt_player_add_inventory);

for (u32 j = 0; j < list->getSize(); j++) {
std::ostringstream os;
list->getItem(j).serialize(os);
std::string itemStr = os.str();
oss.str("");
oss.clear();
list->getItem(j).serialize(oss);
std::string itemStr = oss.str();

str_to_sqlite(m_stmt_player_add_inventory_items, 1, player->getName());
int_to_sqlite(m_stmt_player_add_inventory_items, 2, i);
@@ -729,7 +729,6 @@ void GUIChatConsole::middleClick(s32 col, s32 row)
msg << gettext("Failed to open webpage");
}
msg << " '" << weblink << "'";
msg.flush();
m_chat_backend->addUnparsedMessage(utf8_to_wide(msg.str()));
}
}
@@ -3933,9 +3933,7 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode)
}

if (e != 0) {
std::stringstream ss;
ss << (e->getActiveTab() +1);
fields[name] = ss.str();
fields[name] = itos(e->getActiveTab() + 1);
}
} else if (s.ftype == f_CheckBox) {
// No dynamic cast possible due to some distributions shipped
@@ -3961,12 +3959,10 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode)
e = static_cast<GUIScrollBar *>(element);

if (e) {
std::stringstream os;
os << e->getPos();
if (s.fdefault == L"Changed")
fields[name] = "CHG:" + os.str();
fields[name] = "CHG:" + itos(e->getPos());
else
fields[name] = "VAL:" + os.str();
fields[name] = "VAL:" + itos(e->getPos());
}
} else if (s.ftype == f_AnimatedImage) {
// No dynamic cast possible due to some distributions shipped
@@ -460,7 +460,6 @@ void InventoryList::deSerialize(std::istream &is)
std::getline(is, line, '\n');

std::istringstream iss(line);
//iss.imbue(std::locale("C"));

std::string name;
std::getline(iss, name, ' ');
@@ -60,7 +60,7 @@ bool ItemStackMetadata::setString(const std::string &name, const std::string &va

void ItemStackMetadata::serialize(std::ostream &os) const
{
std::ostringstream os2;
std::ostringstream os2(std::ios_base::binary);
os2 << DESERIALIZE_START;
for (const auto &stringvar : m_stringvars) {
if (!stringvar.first.empty() || !stringvar.second.empty())
@@ -261,7 +261,7 @@ void Client::handleCommand_NodemetaChanged(NetworkPacket *pkt)
return;

std::istringstream is(pkt->readLongString(), std::ios::binary);
std::stringstream sstr;
std::stringstream sstr(std::ios::binary);
decompressZlib(is, sstr);

NodeMetadataList meta_updates_list(false);
@@ -760,12 +760,11 @@ void Client::handleCommand_NodeDef(NetworkPacket* pkt)

// Decompress node definitions
std::istringstream tmp_is(pkt->readLongString(), std::ios::binary);
std::ostringstream tmp_os;
std::stringstream tmp_os(std::ios::binary | std::ios::in | std::ios::out);
decompressZlib(tmp_is, tmp_os);

// Deserialize node definitions
std::istringstream tmp_is2(tmp_os.str());
m_nodedef->deSerialize(tmp_is2);
m_nodedef->deSerialize(tmp_os);
m_nodedef_received = true;
}

@@ -780,12 +779,11 @@ void Client::handleCommand_ItemDef(NetworkPacket* pkt)

// Decompress item definitions
std::istringstream tmp_is(pkt->readLongString(), std::ios::binary);
std::ostringstream tmp_os;
std::stringstream tmp_os(std::ios::binary | std::ios::in | std::ios::out);
decompressZlib(tmp_is, tmp_os);

// Deserialize node definitions
std::istringstream tmp_is2(tmp_os.str());
m_itemdef->deSerialize(tmp_is2);
m_itemdef->deSerialize(tmp_os);
m_itemdef_received = true;
}

@@ -76,10 +76,7 @@ static void set_vector_metatable(lua_State *L)

void push_float_string(lua_State *L, float value)
{
std::stringstream ss;
std::string str;
ss << value;
str = ss.str();
auto str = ftos(value);
lua_pushstring(L, str.c_str());
}

@@ -752,9 +752,7 @@ int ModApiMapgen::l_get_mapgen_params(lua_State *L)
lua_setfield(L, -2, "mgname");

settingsmgr->getMapSetting("seed", &value);
std::istringstream ss(value);
u64 seed;
ss >> seed;
u64 seed = from_string<u64>(value);
lua_pushinteger(L, seed);
lua_setfield(L, -2, "seed");

@@ -272,11 +272,11 @@ int ModApiUtil::l_compress(lua_State *L)
const char *data = luaL_checklstring(L, 1, &size);

int level = -1;
if (!lua_isnone(L, 3) && !lua_isnil(L, 3))
level = readParam<float>(L, 3);
if (!lua_isnoneornil(L, 3))
level = readParam<int>(L, 3);

std::ostringstream os;
compressZlib(std::string(data, size), os, level);
std::ostringstream os(std::ios_base::binary);
compressZlib(reinterpret_cast<const u8 *>(data), size, os, level);

std::string out = os.str();

@@ -292,8 +292,8 @@ int ModApiUtil::l_decompress(lua_State *L)
size_t size;
const char *data = luaL_checklstring(L, 1, &size);

std::istringstream is(std::string(data, size));
std::ostringstream os;
std::istringstream is(std::string(data, size), std::ios_base::binary);
std::ostringstream os(std::ios_base::binary);
decompressZlib(is, os);

std::string out = os.str();
@@ -537,11 +537,8 @@ float Settings::getFloat(const std::string &name) const

u64 Settings::getU64(const std::string &name) const
{
u64 value = 0;
std::string s = get(name);
std::istringstream ss(s);
ss >> value;
return value;
return from_string<u64>(s);
}


@@ -135,7 +135,7 @@ void TestAreaStore::testSerialization()
b.data = "Area BB";
store.insertArea(&b);

std::ostringstream os;
std::ostringstream os(std::ios_base::binary);
store.serialize(os);
std::string str = os.str();

@@ -157,7 +157,7 @@ void TestAreaStore::testSerialization()

UASSERTEQ(const std::string &, str, str_wanted);

std::istringstream is(str);
std::istringstream is(str, std::ios_base::binary);
store.deserialize(is);

// deserialize() doesn't clear the store
@@ -248,7 +248,7 @@ std::string serializeJsonStringIfNeeded(const std::string &s)

std::string deSerializeJsonStringIfNeeded(std::istream &is)
{
std::ostringstream tmp_os;
std::stringstream tmp_os(std::ios_base::binary | std::ios_base::in | std::ios_base::out);
bool expect_initial_quote = true;
bool is_json = false;
bool was_backslash = false;
@@ -280,8 +280,7 @@ std::string deSerializeJsonStringIfNeeded(std::istream &is)
expect_initial_quote = false;
}
if (is_json) {
std::istringstream tmp_is(tmp_os.str(), std::ios::binary);
return deSerializeJsonString(tmp_is);
return deSerializeJsonString(tmp_os);
}

return tmp_os.str();

0 comments on commit 75bf9b7

Please sign in to comment.