nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for error after opening word list file

Browse Source
This commit is contained in:
Oran Juice 2014-09-23 20:48:15 +05:30
parent 09170b4d3b
commit 608572eead
No known key found for this signature in database
GPG Key ID: 71C5AF46CCB28124
2 changed files with 1637 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1626
old-word-list Normal file
View File

File diff suppressed because it is too large Load Diff

17
src/mnemonics/electrum-words.cpp
View File

@ -41,16 +41,17 @@
#include "crypto/crypto.h" // for declaration of crypto::secret_key #include "crypto/crypto.h" // for declaration of crypto::secret_key
#include <fstream> #include <fstream>
#include "mnemonics/electrum-words.h" #include "mnemonics/electrum-words.h"
#include <stdexcept>
namespace namespace
{ {
int num_words = 0; int num_words = 0;
std::map<std::string,uint32_t> words_map; std::map<std::string,uint32_t> words_map;
vector<std::string> words_array; std::vector<std::string> words_array;
const std::string OLD_WORD_FILE = "old-word-list"; const std::string OLD_WORD_FILE = "old-word-list";
const std::string WORD_LIST_DIRECTORY = "wordlists"; const std::string WORD_LIST_DIRECTORY = "wordlists";
bool is_first_use() bool is_first_use()
{ {
return num_words == 0 ? true : false; return num_words == 0 ? true : false;
@ -58,12 +59,16 @@ namespace
void create_data_structures(const std::string &word_file) void create_data_structures(const std::string &word_file)
{ {
ifstream input_stream; std::ifstream input_stream;
input_stream.open(word_file, std::ifstream::in); input_stream.open(word_file.c_str(), std::ifstream::in);
if (!input_stream)
throw std::runtime_error(std::string("Word list file couldn't be opened."));
std::string word; std::string word;
while (input_stream >> word) while (input_stream >> word)
{ {
words_array.push(word); words_array.push_back(word);
words_map[word] = num_words; words_map[word] = num_words;
num_words++; num_words++;
} }
@ -154,7 +159,7 @@ namespace crypto
{ {
if (is_first_use()) if (is_first_use())
{ {
init(); init("", true);
} }
int n = num_words; int n = num_words;