Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Added canary code to catch bugs #55 and #65.

Browse Source
This commit is contained in:
akwizgran
2014-04-04 02:23:09 +01:00
parent 79166e9b2f
commit fbe1c799dd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-core/src/org/briarproject/db/JdbcDatabase.java
View File

@@ -1205,8 +1205,10 @@ abstract class JdbcDatabase implements Database<Connection> {
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
rs = ps.executeQuery(); rs = ps.executeQuery();
List<GroupStatus> groups = new ArrayList<GroupStatus>(); List<GroupStatus> groups = new ArrayList<GroupStatus>();
Set<GroupId> ids = new HashSet<GroupId>();
while(rs.next()) { while(rs.next()) {
GroupId id = new GroupId(rs.getBytes(1)); GroupId id = new GroupId(rs.getBytes(1));
if(!ids.add(id)) throw new DbStateException();
String name = rs.getString(2); String name = rs.getString(2);
byte[] salt = rs.getBytes(3); byte[] salt = rs.getBytes(3);
Group group = new Group(id, name, salt); Group group = new Group(id, name, salt);
@@ -1226,6 +1228,7 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery(); rs = ps.executeQuery();
while(rs.next()) { while(rs.next()) {
GroupId id = new GroupId(rs.getBytes(1)); GroupId id = new GroupId(rs.getBytes(1));
if(!ids.add(id)) throw new DbStateException();
String name = rs.getString(2); String name = rs.getString(2);
byte[] salt = rs.getBytes(3); byte[] salt = rs.getBytes(3);
Group group = new Group(id, name, salt); Group group = new Group(id, name, salt);
@@ -2246,10 +2249,12 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.setLong(2, now); ps.setLong(2, now);
rs = ps.executeQuery(); rs = ps.executeQuery();
List<Group> groups = new ArrayList<Group>(); List<Group> groups = new ArrayList<Group>();
Set<GroupId> ids = new HashSet<GroupId>();
long version = 0; long version = 0;
int txCount = 0; int txCount = 0;
while(rs.next()) { while(rs.next()) {
GroupId id = new GroupId(rs.getBytes(1)); GroupId id = new GroupId(rs.getBytes(1));
if(!ids.add(id)) throw new DbStateException();
String name = rs.getString(2); String name = rs.getString(2);
byte[] salt = rs.getBytes(3); byte[] salt = rs.getBytes(3);
groups.add(new Group(id, name, salt)); groups.add(new Group(id, name, salt));