| Index: runtime/bin/gen_snapshot.cc
|
| diff --git a/runtime/bin/gen_snapshot.cc b/runtime/bin/gen_snapshot.cc
|
| index 70356b5f365c763b6e62adc5fbf3bc154368d54d..6e8752329ef0846f2181076d64cf407f0ce673e2 100644
|
| --- a/runtime/bin/gen_snapshot.cc
|
| +++ b/runtime/bin/gen_snapshot.cc
|
| @@ -724,7 +724,7 @@ static bool ParseEntryPointsManifestSingleLine(
|
| // These allocations are collected in |CleanupEntryPointsCollection|.
|
| char* entry_item =
|
| reinterpret_cast<char*>(calloc(chars_read + 1, sizeof(char)));
|
| - memcpy(entry_item, line + offset, chars_read);
|
| + memmove(entry_item, line + offset, chars_read);
|
|
|
| switch (i) {
|
| case 0: // library
|
| @@ -1047,7 +1047,8 @@ int main(int argc, char** argv) {
|
| DartUtils::ReadFile,
|
| DartUtils::WriteFile,
|
| DartUtils::CloseFile,
|
| - DartUtils::EntropySource);
|
| + DartUtils::EntropySource,
|
| + NULL);
|
| if (error != NULL) {
|
| Log::PrintErr("VM initialization failed: %s\n", error);
|
| free(error);
|
|
|