Validate wallet name in create_from_json (#373)

bitshares · Jun 23, 2014 · fecd6ee · fecd6ee
1 parent 0f340cb
commit fecd6ee
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -583,8 +583,9 @@ namespace bts { namespace wallet {
                         const string& password,
                         const string& brainkey )
    { try {
-      if( !is_valid_account_name(wallet_name))
+      if( !is_valid_account_name( wallet_name ) )
           FC_THROW_EXCEPTION( invalid_name, "Invalid name for a wallet!", ("wallet_name",wallet_name) );
+
       auto wallet_file_path = fc::absolute( get_data_directory() ) / wallet_name;
       if( fc::exists( wallet_file_path ) )
           FC_THROW_EXCEPTION( wallet_already_exists, "Wallet name already exists!", ("wallet_name",wallet_name) );
@@ -660,8 +661,11 @@ namespace bts { namespace wallet {
 
    void wallet::open( const string& wallet_name )
    { try {
+      if( !is_valid_account_name( wallet_name ) )
+          FC_THROW_EXCEPTION( invalid_name, "Invalid name for a wallet!", ("wallet_name",wallet_name) );
+
       auto wallet_file_path = fc::absolute( get_data_directory() ) / wallet_name;
-      if ( !is_valid_account_name(wallet_name) || !fc::exists( wallet_file_path ) )
+      if ( !fc::exists( wallet_file_path ) )
          FC_THROW_EXCEPTION( no_such_wallet, "No such wallet exists!", ("wallet_name", wallet_name) );
 
       try
@@ -741,6 +745,10 @@ namespace bts { namespace wallet {
    void wallet::create_from_json( const path& filename, const string& wallet_name, const string& passphrase )
    { try {
       FC_ASSERT( fc::exists( filename ) );
+
+      if( !is_valid_account_name( wallet_name ) )
+          FC_THROW_EXCEPTION( invalid_name, "Invalid name for a wallet!", ("wallet_name",wallet_name) );
+
       try
       {
           create( wallet_name, passphrase );