twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-02-02 09:54:29 +00:00
Code Issues Projects Releases Wiki Activity

do lazy_entry type checking in loadUserData

Browse Source
This commit is contained in:
Miguel Freitas 2013-10-08 22:45:46 -03:00
parent 4c33706c40
commit 02f3de841b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/twister_utils.cpp
View File

@ -174,21 +174,29 @@ int loadUserData(std::string const& filename, std::map<std::string,UserData> &us
lazy_entry userEntry; lazy_entry userEntry;
error_code ec; error_code ec;
if (lazy_bdecode(&in[0], &in[0] + in.size(), userEntry, ec) == 0) { if (lazy_bdecode(&in[0], &in[0] + in.size(), userEntry, ec) == 0) {
if( userEntry.type() != lazy_entry::dict_t ) goto data_error;
for( int i = 0; i < userEntry.dict_size(); i++) { for( int i = 0; i < userEntry.dict_size(); i++) {
UserData data; UserData data;
const lazy_entry *dataEntry = userEntry.dict_at(i).second; const lazy_entry *dataEntry = userEntry.dict_at(i).second;
const lazy_entry *followingEntry = dataEntry->dict_find("following"); const lazy_entry *followingEntry = dataEntry->dict_find("following");
if( followingEntry->type() != lazy_entry::list_t ) goto data_error;
for( int j = 0; j < followingEntry->list_size(); j++ ) { for( int j = 0; j < followingEntry->list_size(); j++ ) {
data.m_following.insert( followingEntry->list_string_value_at(j) ); data.m_following.insert( followingEntry->list_string_value_at(j) );
} }
const lazy_entry *dmEntry = dataEntry->dict_find("dm"); const lazy_entry *dmEntry = dataEntry->dict_find("dm");
if( dmEntry->type() != lazy_entry::dict_t ) goto data_error;
for( int j = 0; j < dmEntry->dict_size(); j++ ) { for( int j = 0; j < dmEntry->dict_size(); j++ ) {
const lazy_entry *stoDmLstEntry = dmEntry->dict_at(j).second; const lazy_entry *stoDmLstEntry = dmEntry->dict_at(j).second;
if( stoDmLstEntry->type() != lazy_entry::list_t ) goto data_error;
for( int k = 0; k < stoDmLstEntry->list_size(); k++ ) { for( int k = 0; k < stoDmLstEntry->list_size(); k++ ) {
const lazy_entry *stoDmEntry = stoDmLstEntry->list_at(k); const lazy_entry *stoDmEntry = stoDmLstEntry->list_at(k);
if( stoDmEntry->type() != lazy_entry::dict_t ) goto data_error;
StoredDirectMsg dm; StoredDirectMsg dm;
dm.m_text = stoDmEntry->dict_find_string_value("text"); dm.m_text = stoDmEntry->dict_find_string_value("text");
dm.m_utcTime = stoDmEntry->dict_find_int_value("time"); dm.m_utcTime = stoDmEntry->dict_find_int_value("time");
@ -196,13 +204,16 @@ int loadUserData(std::string const& filename, std::map<std::string,UserData> &us
data.m_directmsg[dmEntry->dict_at(j).first].push_back(dm); data.m_directmsg[dmEntry->dict_at(j).first].push_back(dm);
} }
} }
users[userEntry.dict_at(i).first] = data; users[userEntry.dict_at(i).first] = data;
} }
return 0; return 0;
} }
} }
return -1; return -1;
data_error:
printf("loadUserData: unexpected bencode type - user_data corrupt!\n");
return -2;
} }