maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Address a few post facto review comments from Adrian. 

Thanks, Adrian!

llvm-svn: 336398
This commit is contained in:
Jim Ingham 2018-07-05 23:23:06 +00:00
parent 9555351339
commit 03856dd9c6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/include/lldb/Target/Platform.h
View File

@ -840,7 +840,11 @@ public:
/// The process to load the image. /// The process to load the image.
/// ///
/// @param[in] library_name /// @param[in] library_name
/// The name of the library to look for. /// The name of the library to look for. If library_name is an
/// absolute path, the basename will be extracted and searched for
/// along the paths. This emulates the behavior of the loader when
/// given an install name and a set (e.g. DYLD_LIBRARY_PATH provided) of
/// alternate paths.
/// ///
/// @param[in] path_list /// @param[in] path_list
/// The list of paths to use to search for the library. First /// The list of paths to use to search for the library. First

10
lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
View File

@ -946,7 +946,7 @@ PlatformPOSIX::MakeLoadImageUtilityFunction(ExecutionContext &exe_ctx,
const char *error_str; const char *error_str;
}; };
extern void *memcpy(void *, void *, size_t size); extern void *memcpy(void *, const void *, size_t size);
extern size_t strlen(const char *); extern size_t strlen(const char *);
@ -956,23 +956,23 @@ PlatformPOSIX::MakeLoadImageUtilityFunction(ExecutionContext &exe_ctx,
__lldb_dlopen_result *result_ptr) __lldb_dlopen_result *result_ptr)
{ {
// This is the case where the name is the full path: // This is the case where the name is the full path:
if (path_strings == (char *) 0x0) { if (!path_strings) {
result_ptr->image_ptr = dlopen(name, 2); result_ptr->image_ptr = dlopen(name, 2);
if (result_ptr->image_ptr != (void *) 0x0) if (result_ptr->image_ptr)
result_ptr->error_str = nullptr; result_ptr->error_str = nullptr;
return nullptr; return nullptr;
} }
// This is the case where we have a list of paths: // This is the case where we have a list of paths:
size_t name_len = strlen(name); size_t name_len = strlen(name);
while (path_strings != (void *) 0x0 && path_strings[0] != '\0') { while (path_strings && path_strings[0] != '\0') {
size_t path_len = strlen(path_strings); size_t path_len = strlen(path_strings);
memcpy((void *) buffer, (void *) path_strings, path_len); memcpy((void *) buffer, (void *) path_strings, path_len);
buffer[path_len] = '/'; buffer[path_len] = '/';
char *target_ptr = buffer+path_len+1; char *target_ptr = buffer+path_len+1;
memcpy((void *) target_ptr, (void *) name, name_len + 1); memcpy((void *) target_ptr, (void *) name, name_len + 1);
result_ptr->image_ptr = dlopen(buffer, 2); result_ptr->image_ptr = dlopen(buffer, 2);
if (result_ptr->image_ptr != (void *) 0x0) { if (result_ptr->image_ptr) {
result_ptr->error_str = nullptr; result_ptr->error_str = nullptr;
break; break;
} }