ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 19:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes.

Browse Source
This commit is contained in:
JoelKatz
2011-12-30 18:49:38 -08:00
parent f6830341a0
commit 812df57fcf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Wallet.cpp
View File

@@ -117,7 +117,7 @@ LocalAccountFamily::pointer LocalAccountFamily::readFamily(const uint160& family
ScopedLock sl(theApp->getWalletDB()->getDBLock()); ScopedLock sl(theApp->getWalletDB()->getDBLock());
Database *db=theApp->getWalletDB()->getDB(); Database *db=theApp->getWalletDB()->getDB();
if(!db->executeSQL(sql.c_str()) || !db->getNextRow()) if(!db->executeSQL(sql.c_str()) || !db->startIterRows() || !db->getNextRow())
return LocalAccountFamily::pointer(); return LocalAccountFamily::pointer();
db->getStr("RootPubKey", rootPubKey); db->getStr("RootPubKey", rootPubKey);
@@ -192,7 +192,7 @@ bool LocalAccountFamily::isHexPublicKey(const std::string& s)
{ // 66 characters, all legal hex, starts with '02' or '03' { // 66 characters, all legal hex, starts with '02' or '03'
if(s.size()!=66) return false; if(s.size()!=66) return false;
if(s[0]!='0') return false; if(s[0]!='0') return false;
if((s[1]!='2') && (s[2]!='3')) return false; if((s[1]!='2') && (s[1]!='3')) return false;
for(int i=3; i<66; i++) for(int i=3; i<66; i++)
if(!isHex(s[i])) return false; if(!isHex(s[i])) return false;
return true; return true;
@@ -300,7 +300,8 @@ void Wallet::load()
ScopedLock sl(theApp->getWalletDB()->getDBLock()); ScopedLock sl(theApp->getWalletDB()->getDBLock());
Database *db=theApp->getWalletDB()->getDB(); Database *db=theApp->getWalletDB()->getDB();
if(!db->executeSQL(sql.c_str())) return; if(!db->executeSQL(sql.c_str()) || !db->startIterRows())
return;
while(db->getNextRow()) while(db->getNextRow())
{ {