| Index: sync/internal_api/sync_encryption_handler_impl.cc
|
| diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc
|
| index 4bf559fd8580c958fe0caa8d18ddfa01ceb933a5..1e73b4a78921349e1102dd34cdacc4ca571d7f6b 100644
|
| --- a/sync/internal_api/sync_encryption_handler_impl.cc
|
| +++ b/sync/internal_api/sync_encryption_handler_impl.cc
|
| @@ -833,10 +833,8 @@ void SyncEncryptionHandlerImpl::ReEncryptEverything(
|
| int64 child_id = passwords_root.GetFirstChildId();
|
| while (child_id != kInvalidId) {
|
| WriteNode child(trans);
|
| - if (child.InitByIdLookup(child_id) != BaseNode::INIT_OK) {
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| + if (child.InitByIdLookup(child_id) != BaseNode::INIT_OK)
|
| + break; // Possible if we failed to decrypt the data for some reason.
|
| child.SetPasswordSpecifics(child.GetPasswordSpecifics());
|
| child_id = child.GetSuccessorId();
|
| }
|
|
|