Avoid trusting the length encoded in the Snapshot if there is an

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 805 matching lines @@
     RETURN_NULL_ERROR(size);
   }
   const char* msg = CheckIsolateState(isolate,
                                       ClassFinalizer::kGeneratingSnapshot);
   if (msg != NULL) {
     return Api::NewError(msg);
   }
   // Since this is only a snapshot the root library should not be set.
   isolate->object_store()->set_root_library(Library::Handle(isolate));
   SnapshotWriter writer(Snapshot::kFull, buffer, ApiReallocate);
-  writer.WriteFullSnapshot();
-  *size = writer.BytesWritten();
+  *size = writer.WriteFullSnapshot();

[siva, 2012/08/22 23:30:39]

I would prefer not returning the size as a return value from WriteFullSnapshot
because we may want to return an error once we beef it up for chunked writing.

[turnidge, 2012/08/23 18:37:57]

Done.

   return Api::Success(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_CreateScriptSnapshot(uint8_t** buffer,
                                                   intptr_t* size) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   TIMERSCOPE(time_creating_snapshot);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
   if (size == NULL) {
     RETURN_NULL_ERROR(size);
   }
   const char* msg = CheckIsolateState(isolate);
   if (msg != NULL) {
     return Api::NewError(msg);
   }
   Library& library =
       Library::Handle(isolate, isolate->object_store()->root_library());
   if (library.IsNull()) {
     return
         Api::NewError("%s expects the isolate to have a script loaded in it.",
                       CURRENT_FUNC);
   }
   ScriptSnapshotWriter writer(buffer, ApiReallocate);
-  writer.WriteScriptSnapshot(library);
-  *size = writer.BytesWritten();
+  *size = writer.WriteScriptSnapshot(library);
   return Api::Success(isolate);
 }
 
 
 DART_EXPORT void Dart_InterruptIsolate(Dart_Isolate isolate) {
   if (isolate == NULL) {
     FATAL1("%s expects argument 'isolate' to be non-null.",  CURRENT_FUNC);
   }
   Isolate* iso = reinterpret_cast<Isolate*>(isolate);
   iso->ScheduleInterrupts(Isolate::kApiInterrupt);
@@ skipping 80 matching lines @@
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 DART_EXPORT bool Dart_PostIntArray(Dart_Port port_id,
                                    intptr_t len,
                                    intptr_t* data) {
   uint8_t* buffer = NULL;
   ApiMessageWriter writer(&buffer, &allocator);
 
-  writer.WriteMessage(len, data);
+  intptr_t buffer_len = writer.WriteMessage(len, data);
 
   // Post the message at the given port.
   return PortMap::PostMessage(new Message(
-      port_id, Message::kIllegalPort, buffer, Message::kNormalPriority));
+      port_id, Message::kIllegalPort, buffer, buffer_len,
+      Message::kNormalPriority));
 }
 
 
 DART_EXPORT bool Dart_PostCObject(Dart_Port port_id, Dart_CObject* message) {
   uint8_t* buffer = NULL;
   ApiMessageWriter writer(&buffer, allocator);
 
-  writer.WriteCMessage(message);
+  intptr_t buffer_len = writer.WriteCMessage(message);
 
   // Post the message at the given port.
   return PortMap::PostMessage(new Message(
-      port_id, Message::kIllegalPort, buffer, Message::kNormalPriority));
+      port_id, Message::kIllegalPort, buffer, buffer_len,
+      Message::kNormalPriority));
 }
 
 
 DART_EXPORT bool Dart_Post(Dart_Port port_id, Dart_Handle handle) {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   DARTSCOPE_NOCHECKS(isolate);
   const Object& object = Object::Handle(isolate, Api::UnwrapHandle(handle));
   uint8_t* data = NULL;
   SnapshotWriter writer(Snapshot::kMessage, &data, &allocator);
   writer.WriteObject(object.raw());
-  writer.FinalizeBuffer();
+  intptr_t len = writer.FinalizeBuffer();
   return PortMap::PostMessage(new Message(
-      port_id, Message::kIllegalPort, data, Message::kNormalPriority));
+      port_id, Message::kIllegalPort, data, len, Message::kNormalPriority));
 }
 
 
 DART_EXPORT Dart_Port Dart_NewNativePort(const char* name,
                                          Dart_NativeMessageHandler handler,
                                          bool handle_concurrently) {
   if (name == NULL) {
     name = "<UnnamedNativePort>";
   }
   if (handler == NULL) {
@@ skipping 2778 matching lines @@
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScriptFromSnapshot(const uint8_t* buffer) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   TIMERSCOPE(time_script_loading);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
-  const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
+  const Snapshot* snapshot =
+      Snapshot::SetupFromBuffer(buffer, Snapshot::kTrustedLength);
+  if (snapshot == NULL) {
+    return Api::NewError("%s: unexpected error during snapshot parsing."
+                         " snapshot", CURRENT_FUNC);
+  }
   if (!snapshot->IsScriptSnapshot()) {
     return Api::NewError("%s expects parameter 'buffer' to be a script type"
-                         " snapshot", CURRENT_FUNC);
+                         " snapshot.", CURRENT_FUNC);
   }
   Library& library =
       Library::Handle(isolate, isolate->object_store()->root_library());
   if (!library.IsNull()) {
     const String& library_url = String::Handle(isolate, library.url());
     return Api::NewError("%s: A script has already been loaded from '%s'.",
                          CURRENT_FUNC, library_url.ToCString());
   }
   SnapshotReader reader(snapshot, isolate);
   const Object& tmp = Object::Handle(isolate, reader.ReadObject());
@@ skipping 281 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart