chrome/browser/chromeos/gdata/gdata_file_system.cc - Issue 10815058: gdata: Check entry_proto.get() before calling has_file_specific_info()

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: chrome/browser/chromeos/gdata/gdata_file_system.cc

Issue 10815058: gdata: Check entry_proto.get() before calling has_file_specific_info() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 8 years, 5 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: chrome/browser/chromeos/gdata/gdata_file_system.cc

diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc

index bf441df31f4bad2b6249e5036a95cb525e178ff4..955e04af2fc318002417629b9c73e9a44c406638 100644

--- a/chrome/browser/chromeos/gdata/gdata_file_system.cc

+++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc

@@ -1905,7 +1905,7 @@ void GDataFileSystem::GetResolvedFileByPath(

const GDataEntryProto* entry_proto) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- if (!entry_proto->has_file_specific_info())

+ if (entry_proto && !entry_proto->has_file_specific_info())

error = GDATA_FILE_ERROR_NOT_FOUND;

if (error != GDATA_FILE_OK) {

@@ -3793,7 +3793,7 @@ void GDataFileSystem::OnGetEntryInfoCompleteForOpenFile(

scoped_ptr<GDataEntryProto> entry_proto) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- if (!entry_proto->has_file_specific_info())

+ if (entry_proto.get() && !entry_proto->has_file_specific_info())

error = GDATA_FILE_ERROR_NOT_FOUND;

if (error == GDATA_FILE_OK) {

@@ -3918,7 +3918,7 @@ void GDataFileSystem::OnGetEntryInfoCompleteForCloseFile(

const FileOperationCallback& callback,

GDataFileError error,

scoped_ptr<GDataEntryProto> entry_proto) {

- if (!entry_proto->has_file_specific_info())

+ if (entry_proto.get() && !entry_proto->has_file_specific_info())

error = GDATA_FILE_ERROR_NOT_FOUND;

if (error != GDATA_FILE_OK) {