Make sure an error is returned when Process::LoadImage() fails.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@154965 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Process.cpp b/source/Target/Process.cpp
index c32b4b1..dd283c5 100644
--- a/source/Target/Process.cpp
+++ b/source/Target/Process.cpp
@@ -1391,6 +1391,9 @@
uint32_t
Process::LoadImage (const FileSpec &image_spec, Error &error)
{
+ char path[PATH_MAX];
+ image_spec.GetPath(path, sizeof(path));
+
DynamicLoader *loader = GetDynamicLoader();
if (loader)
{
@@ -1413,8 +1416,6 @@
frame_sp->CalculateExecutionContext (exe_ctx);
bool unwind_on_error = true;
StreamString expr;
- char path[PATH_MAX];
- image_spec.GetPath(path, sizeof(path));
expr.Printf("dlopen (\"%s\", 2)", path);
const char *prefix = "extern \"C\" void* dlopen (const char *path, int mode);\n";
lldb::ValueObjectSP result_valobj_sp;
@@ -1437,6 +1438,8 @@
}
}
}
+ if (!error.AsCString())
+ error.SetErrorStringWithFormat("unable to load '%s'", path);
return LLDB_INVALID_IMAGE_TOKEN;
}