chrome/browser/chromeos/file_system_provider/operations/read_file.cc - Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values.

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/file_system_provider/operations/read_file.cc

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema

Patch Set: Fix merge error. Created 5 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_system_provider/operations/read_file.cc

diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file.cc

index 1e405c852901c3bfa96f8249877f392ebaee8490..e1d560895361c5e047a5a6e0e751ffa3dda07c0f 100644

--- a/chrome/browser/chromeos/file_system_provider/operations/read_file.cc

+++ b/chrome/browser/chromeos/file_system_provider/operations/read_file.cc

@@ -8,6 +8,7 @@

#include <string>

#include "base/debug/trace_event.h"

+#include "base/stl_util.h"

#include "chrome/common/extensions/api/file_system_provider.h"

#include "chrome/common/extensions/api/file_system_provider_internal.h"

@@ -29,13 +30,14 @@ int CopyRequestValueToBuffer(scoped_ptr<RequestValue> value,

if (!params)

return -1;

- const size_t chunk_size = params->data.length();

+ const size_t chunk_size = params->data.size();

// Check for overflows.

if (chunk_size > static_cast<size_t>(buffer_length) - buffer_offset)

return -1;

- memcpy(buffer->data() + buffer_offset, params->data.c_str(), chunk_size);

+ memcpy(buffer->data() + buffer_offset, vector_as_array(&params->data),

+ chunk_size);

return chunk_size;

}