mirror of
https://github.com/dart-lang/sdk
synced 2024-09-16 02:07:06 +00:00
Handle invalid dill files more gracefully
Instead of bailing out with FATAL et al (which shuts down the VM), give an ApiError when the dill file is invalid. Bug: #33577 Change-Id: I8354b4e68ee95e36584284fd15b3abab3c3bf980 Reviewed-on: https://dart-review.googlesource.com/61937 Commit-Queue: Jens Johansen <jensj@google.com> Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
This commit is contained in:
parent
9aa0c4ae3f
commit
f67308a983
|
@ -314,8 +314,17 @@ static RawError* BootstrapFromKernel(Thread* thread,
|
||||||
const uint8_t* kernel_buffer,
|
const uint8_t* kernel_buffer,
|
||||||
intptr_t kernel_buffer_size) {
|
intptr_t kernel_buffer_size) {
|
||||||
Zone* zone = thread->zone();
|
Zone* zone = thread->zone();
|
||||||
kernel::Program* program =
|
const char* error = nullptr;
|
||||||
kernel::Program::ReadFromBuffer(kernel_buffer, kernel_buffer_size);
|
kernel::Program* program = kernel::Program::ReadFromBuffer(
|
||||||
|
kernel_buffer, kernel_buffer_size, &error);
|
||||||
|
if (program == nullptr) {
|
||||||
|
const intptr_t kMessageBufferSize = 512;
|
||||||
|
char message_buffer[kMessageBufferSize];
|
||||||
|
Utils::SNPrint(message_buffer, kMessageBufferSize,
|
||||||
|
"Can't load Kernel binary: %s.", error);
|
||||||
|
const String& msg = String::Handle(String::New(message_buffer, Heap::kOld));
|
||||||
|
return ApiError::New(msg, Heap::kOld);
|
||||||
|
}
|
||||||
kernel::KernelLoader loader(program);
|
kernel::KernelLoader loader(program);
|
||||||
Isolate* isolate = thread->isolate();
|
Isolate* isolate = thread->isolate();
|
||||||
|
|
||||||
|
|
|
@ -74,8 +74,17 @@ RawError* BootstrapFromKernel(Thread* thread,
|
||||||
const uint8_t* kernel_buffer,
|
const uint8_t* kernel_buffer,
|
||||||
intptr_t kernel_buffer_size) {
|
intptr_t kernel_buffer_size) {
|
||||||
Zone* zone = thread->zone();
|
Zone* zone = thread->zone();
|
||||||
kernel::Program* program =
|
const char* error = nullptr;
|
||||||
kernel::Program::ReadFromBuffer(kernel_buffer, kernel_buffer_size);
|
kernel::Program* program = kernel::Program::ReadFromBuffer(
|
||||||
|
kernel_buffer, kernel_buffer_size, &error);
|
||||||
|
if (program == nullptr) {
|
||||||
|
const intptr_t kMessageBufferSize = 512;
|
||||||
|
char message_buffer[kMessageBufferSize];
|
||||||
|
Utils::SNPrint(message_buffer, kMessageBufferSize,
|
||||||
|
"Can't load Kernel binary: %s.", error);
|
||||||
|
const String& msg = String::Handle(String::New(message_buffer, Heap::kOld));
|
||||||
|
return ApiError::New(msg, Heap::kOld);
|
||||||
|
}
|
||||||
kernel::KernelLoader loader(program);
|
kernel::KernelLoader loader(program);
|
||||||
Isolate* isolate = thread->isolate();
|
Isolate* isolate = thread->isolate();
|
||||||
|
|
||||||
|
|
|
@ -5384,8 +5384,12 @@ DART_EXPORT Dart_Handle Dart_LoadScriptFromKernel(const uint8_t* buffer,
|
||||||
CHECK_CALLBACK_STATE(T);
|
CHECK_CALLBACK_STATE(T);
|
||||||
CHECK_COMPILATION_ALLOWED(I);
|
CHECK_COMPILATION_ALLOWED(I);
|
||||||
|
|
||||||
|
const char* error = nullptr;
|
||||||
kernel::Program* program =
|
kernel::Program* program =
|
||||||
kernel::Program::ReadFromBuffer(buffer, buffer_size);
|
kernel::Program::ReadFromBuffer(buffer, buffer_size, &error);
|
||||||
|
if (program == nullptr) {
|
||||||
|
return Api::NewError("Can't load Kernel binary: %s.", error);
|
||||||
|
}
|
||||||
const Object& tmp = kernel::KernelLoader::LoadEntireProgram(program);
|
const Object& tmp = kernel::KernelLoader::LoadEntireProgram(program);
|
||||||
delete program;
|
delete program;
|
||||||
|
|
||||||
|
@ -5681,8 +5685,12 @@ DART_EXPORT Dart_Handle Dart_LoadLibraryFromKernel(const uint8_t* buffer,
|
||||||
CHECK_CALLBACK_STATE(T);
|
CHECK_CALLBACK_STATE(T);
|
||||||
CHECK_COMPILATION_ALLOWED(I);
|
CHECK_COMPILATION_ALLOWED(I);
|
||||||
|
|
||||||
|
const char* error = nullptr;
|
||||||
kernel::Program* program =
|
kernel::Program* program =
|
||||||
kernel::Program::ReadFromBuffer(buffer, buffer_size);
|
kernel::Program::ReadFromBuffer(buffer, buffer_size, &error);
|
||||||
|
if (program == nullptr) {
|
||||||
|
return Api::NewError("Can't load Kernel binary: %s.", error);
|
||||||
|
}
|
||||||
const Object& result =
|
const Object& result =
|
||||||
kernel::KernelLoader::LoadEntireProgram(program, false);
|
kernel::KernelLoader::LoadEntireProgram(program, false);
|
||||||
delete program;
|
delete program;
|
||||||
|
|
|
@ -60,10 +60,12 @@ class Program {
|
||||||
// Read a kernel Program from the given Reader. Note the returned Program
|
// Read a kernel Program from the given Reader. Note the returned Program
|
||||||
// can potentially contain several "sub programs", though the library count
|
// can potentially contain several "sub programs", though the library count
|
||||||
// etc will reference the last "sub program" only.
|
// etc will reference the last "sub program" only.
|
||||||
static Program* ReadFrom(Reader* reader);
|
static Program* ReadFrom(Reader* reader, const char** error = nullptr);
|
||||||
|
|
||||||
static Program* ReadFromFile(const char* script_uri);
|
static Program* ReadFromFile(const char* script_uri);
|
||||||
static Program* ReadFromBuffer(const uint8_t* buffer, intptr_t buffer_length);
|
static Program* ReadFromBuffer(const uint8_t* buffer,
|
||||||
|
intptr_t buffer_length,
|
||||||
|
const char** error = nullptr);
|
||||||
|
|
||||||
bool is_single_program() { return single_program_; }
|
bool is_single_program() { return single_program_; }
|
||||||
NameIndex main_method() { return main_method_reference_; }
|
NameIndex main_method() { return main_method_reference_; }
|
||||||
|
|
|
@ -29,14 +29,49 @@ const char* Reader::TagName(Tag tag) {
|
||||||
return "Unknown";
|
return "Unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
Program* Program::ReadFrom(Reader* reader) {
|
const char* kKernelInvalidFilesize =
|
||||||
|
"File size is too small to a valid kernel file";
|
||||||
|
const char* kKernelInvalidMagicIdentifier = "Invalid magic identifier";
|
||||||
|
const char* kKernelInvalidBinaryFormatVersion =
|
||||||
|
"Invalid kernel binary format version";
|
||||||
|
const char* kKernelInvalidSizeIndicated =
|
||||||
|
"Invalid kernel binary: Indicated size is invalid";
|
||||||
|
|
||||||
|
Program* Program::ReadFrom(Reader* reader, const char** error) {
|
||||||
|
if (reader->size() < 59) {
|
||||||
|
// A kernel file currently contains at least the following:
|
||||||
|
// * Magic number (32)
|
||||||
|
// * Kernel version (32)
|
||||||
|
// * Length of source map (32)
|
||||||
|
// * Length of canonical name table (8)
|
||||||
|
// * Metadata length (32)
|
||||||
|
// * Length of string table (8)
|
||||||
|
// * Length of constant table (8)
|
||||||
|
// * Component index (10 * 32)
|
||||||
|
//
|
||||||
|
// so is at least 59 bytes.
|
||||||
|
// (Technically it will also contain an empty entry in both source map and
|
||||||
|
// string table, taking up another 8 bytes.)
|
||||||
|
if (error != nullptr) {
|
||||||
|
*error = kKernelInvalidFilesize;
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t magic = reader->ReadUInt32();
|
uint32_t magic = reader->ReadUInt32();
|
||||||
if (magic != kMagicProgramFile) FATAL("Invalid magic identifier");
|
if (magic != kMagicProgramFile) {
|
||||||
|
if (error != nullptr) {
|
||||||
|
*error = kKernelInvalidMagicIdentifier;
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t formatVersion = reader->ReadUInt32();
|
uint32_t formatVersion = reader->ReadUInt32();
|
||||||
if (formatVersion != kBinaryFormatVersion) {
|
if (formatVersion != kBinaryFormatVersion) {
|
||||||
FATAL2("Invalid kernel binary format version (found %u, expected %u)",
|
if (error != nullptr) {
|
||||||
formatVersion, kBinaryFormatVersion);
|
*error = kKernelInvalidBinaryFormatVersion;
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
Program* program = new Program();
|
Program* program = new Program();
|
||||||
|
@ -51,7 +86,11 @@ Program* Program::ReadFrom(Reader* reader) {
|
||||||
intptr_t size = reader->ReadUInt32();
|
intptr_t size = reader->ReadUInt32();
|
||||||
intptr_t start = reader->offset() - size;
|
intptr_t start = reader->offset() - size;
|
||||||
if (start < 0) {
|
if (start < 0) {
|
||||||
FATAL("Invalid kernel binary: Indicated size is invalid.");
|
if (error != nullptr) {
|
||||||
|
*error = kKernelInvalidSizeIndicated;
|
||||||
|
}
|
||||||
|
delete program;
|
||||||
|
return nullptr;
|
||||||
}
|
}
|
||||||
++subprogram_count;
|
++subprogram_count;
|
||||||
if (subprogram_count > 1) break;
|
if (subprogram_count > 1) break;
|
||||||
|
@ -116,9 +155,10 @@ Program* Program::ReadFromFile(const char* script_uri) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Program* Program::ReadFromBuffer(const uint8_t* buffer,
|
Program* Program::ReadFromBuffer(const uint8_t* buffer,
|
||||||
intptr_t buffer_length) {
|
intptr_t buffer_length,
|
||||||
|
const char** error) {
|
||||||
kernel::Reader reader(buffer, buffer_length);
|
kernel::Reader reader(buffer, buffer_length);
|
||||||
return kernel::Program::ReadFrom(&reader);
|
return kernel::Program::ReadFrom(&reader, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace kernel
|
} // namespace kernel
|
||||||
|
|
Loading…
Reference in a new issue