archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Pass string error buffer into dln_open

Browse source 
On Windows, the error exists on the stack so we should pass an error
buffer from the caller.
This commit is contained in:
Peter Zhu 2024-04-24 11:01:09 -04:00
parent 853c0b1a77
commit 057b69cfdf
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dln.c
View file

@ -194,7 +194,6 @@ dln_strerror(char *message, size_t size)
}
return message;
}
#define dln_strerror() dln_strerror(message, sizeof message)
#elif defined USE_DLN_DLOPEN
static const char *
dln_strerror(void)
@ -340,14 +339,12 @@ dln_disable_dlclose(void)
#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
void *
dln_open(const char *file, const char **error)
dln_open(const char *file, char *error, size_t size)
{
static const char incompatible[] = "incompatible library version";
void *handle;
#if defined(_WIN32)
char message[1024];
/* Convert the file path to wide char */
WCHAR *winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
if (!winfile) {
@ -359,14 +356,14 @@ dln_open(const char *file, const char **error)
free(winfile);
if (!handle) {
*error = dln_strerror();
strlcpy(error, dln_strerror(error, size), size);
return NULL;
}
# if defined(RUBY_EXPORT)
if (!rb_w32_check_imported(handle, rb_libruby_handle())) {
FreeLibrary(handle);
*error = incompatible;
strlcpy(error, incompatible, size);
return NULL;
}
# endif
@ -386,7 +383,7 @@ dln_open(const char *file, const char **error)
/* Load file */
handle = dlopen(file, RTLD_LAZY|RTLD_GLOBAL);
if (handle == NULL) {
*error = dln_strerror();
strlcpy(error, dln_strerror(), size);
return NULL;
}
@ -409,10 +406,14 @@ dln_open(const char *file, const char **error)
libruby_name = tmp;
}
dlclose(handle);
if (libruby_name) {
dln_loaderror("linked to incompatible %s - %s", libruby_name, file);
snprintf(error, size, "linked to incompatible %s - %s", libruby_name, file);
}
*error = incompatible;
else {
strlcpy(error, incompatible, size);
}
return NULL;
}
}
@ -442,7 +443,7 @@ dln_sym_func(void *handle, const char *symbol)
const char *error;
#if defined(_WIN32)
char message[1024];
error = dln_strerror();
error = dln_strerror(message, sizeof(message));
#elif defined(USE_DLN_DLOPEN)
const size_t errlen = strlen(error = dln_strerror()) + 1;
error = memcpy(ALLOCA_N(char, errlen), error, errlen);
@ -497,8 +498,8 @@ void *
dln_load(const char *file)
{
#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
const char *error = NULL;
void *handle = dln_open(file, &error);
char error[1024];
void *handle = dln_open(file, error, sizeof(error));
if (handle == NULL) {
dln_loaderror("%s - %s", error, file);