ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-18 18:56:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some potential bugs (in non-test code) exposed by check-miscaptures.py. refs #1556

Browse Source
This commit is contained in:
david-sarah 2011-10-06 20:24:44 -07:00
parent bdfa7b3772
commit a31a701e42
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/mutable/filenode.py
View File

@ -1136,14 +1136,14 @@ class MutableFileVersion:
start_segments = {} # shnum -> start segment
end_segments = {} # shnum -> end segment
blockhashes = {} # shnum -> blockhash tree
for (shnum, data) in update_data.iteritems():
data = [d[1] for d in data if d[0] == self._version]
for (shnum, original_data) in update_data.iteritems():
data = [d[1] for d in original_data if d[0] == self._version]
# Every data entry in our list should now be share shnum for
# a particular version of the mutable file, so all of the
# entries should be identical.
datum = data[0]
assert filter(lambda x: x != datum, data) == []
assert [x for x in data if x != datum] == []
blockhashes[shnum] = datum[0]
start_segments[shnum] = datum[1]

8
src/allmydata/mutable/servermap.py
View File

@ -680,7 +680,7 @@ class ServermapUpdater:
d.addCallback(lambda results, shnum=shnum, peerid=peerid:
self._try_to_set_pubkey(results, peerid, shnum, lp))
# XXX: Make self._pubkey_query_failed?
d.addErrback(lambda error, shnum=shnum, peerid=peerid:
d.addErrback(lambda error, shnum=shnum, peerid=peerid, data=data:
self._got_corrupt_share(error, shnum, peerid, data, lp))
else:
# we already have the public key.
@ -695,7 +695,7 @@ class ServermapUpdater:
# bytes of the share on the storage server, so we
# shouldn't need to fetch anything at this step.
d2 = reader.get_verinfo()
d2.addErrback(lambda error, shnum=shnum, peerid=peerid:
d2.addErrback(lambda error, shnum=shnum, peerid=peerid, data=data:
self._got_corrupt_share(error, shnum, peerid, data, lp))
# - Next, we need the signature. For an SDMF share, it is
# likely that we fetched this when doing our initial fetch
@ -703,7 +703,7 @@ class ServermapUpdater:
# the end of the share, so unless the file is quite small,
# we'll need to do a remote fetch to get it.
d3 = reader.get_signature()
d3.addErrback(lambda error, shnum=shnum, peerid=peerid:
d3.addErrback(lambda error, shnum=shnum, peerid=peerid, data=data:
self._got_corrupt_share(error, shnum, peerid, data, lp))
# Once we have all three of these responses, we can move on
# to validating the signature
@ -714,7 +714,7 @@ class ServermapUpdater:
d4 = reader.get_encprivkey()
d4.addCallback(lambda results, shnum=shnum, peerid=peerid:
self._try_to_validate_privkey(results, peerid, shnum, lp))
d4.addErrback(lambda error, shnum=shnum, peerid=peerid:
d4.addErrback(lambda error, shnum=shnum, peerid=peerid, data=data:
self._privkey_query_failed(error, shnum, data, lp))
else:
d4 = defer.succeed(None)