sync/internal_api/syncapi_internal.cc - Issue 1161463005: [Sync] Don't crash for encryption errors

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/syncapi_internal.cc

Issue 1161463005: [Sync] Don't crash for encryption errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add comments Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sync/internal_api/syncapi_internal.cc

diff --git a/sync/internal_api/syncapi_internal.cc b/sync/internal_api/syncapi_internal.cc

index 91a6d79fd1b47417ec7a788df4a23258b3f57868..d3ac5231043c0918a0c746fc09680e15f49b66b8 100644

--- a/sync/internal_api/syncapi_internal.cc

+++ b/sync/internal_api/syncapi_internal.cc

@@ -30,6 +30,8 @@ sync_pb::PasswordSpecificsData* DecryptPasswordSpecifics(

const sync_pb::EncryptedData& encrypted = password_specifics.encrypted();

scoped_ptr<sync_pb::PasswordSpecificsData> data(

new sync_pb::PasswordSpecificsData);

+ if (!crypto->CanDecrypt(encrypted))

+ return NULL;

if (!crypto->Decrypt(encrypted, data.get()))

return NULL;

return data.release();