Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPTCH-3534: Use already loaded version of JSCoreGTK if available #77

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

nmoinvaz
Copy link
Owner

@nmoinvaz nmoinvaz commented Dec 9, 2024

No description provided.

@nmoinvaz nmoinvaz added the bug Something isn't working label Dec 9, 2024
@nmoinvaz nmoinvaz requested a review from sergio-nsk December 9, 2024 19:41
Copy link

codecov bot commented Dec 9, 2024

Codecov Report

Attention: Patch coverage is 68.42105% with 6 lines in your changes missing coverage. Please review.

Project coverage is 59.28%. Comparing base (6c6f61c) to head (7b8fabf).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
execute_jscore.c 68.42% 3 Missing and 3 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master      #77      +/-   ##
==========================================
+ Coverage   58.73%   59.28%   +0.54%     
==========================================
  Files          53       53              
  Lines        4709     4721      +12     
  Branches     1078     1081       +3     
==========================================
+ Hits         2766     2799      +33     
+ Misses       1336     1320      -16     
+ Partials      607      602       -5     
Flag Coverage Δ
macos 55.63% <ø> (ø)
ubuntu 53.88% <68.42%> (+0.73%) ⬆️
ubuntu_curl 53.58% <68.42%> (+0.50%) ⬆️
windows 56.84% <ø> (+0.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nmoinvaz nmoinvaz force-pushed the nathan/dev/SPTCH-3534/1 branch 2 times, most recently from b4044ae to e8d9978 Compare December 9, 2024 19:46
@nmoinvaz nmoinvaz enabled auto-merge (rebase) December 9, 2024 20:04
execute_jscore.c Outdated
Comment on lines 390 to 400
if (dlinfo(current_process, RTLD_DI_LINKMAP, &map) == 0) {
while (map && !g_proxy_execute_jscore.module) {
for (size_t i = 0; i < library_names_size; i++) {
if (strstr(map->l_name, library_names[i])) {
g_proxy_execute_jscore.module = dlopen(map->l_name, RTLD_NOLOAD | RTLD_LAZY | RTLD_LOCAL);
break;
}
}
map = map->l_next;
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extremely deep indentations. Can you make a function that exits early if conditions are nor met.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think doing a separate function might make it more complex. I have removed one of the indentations though.

@nmoinvaz nmoinvaz force-pushed the nathan/dev/SPTCH-3534/1 branch from e8d9978 to 7b8fabf Compare December 9, 2024 21:18
Copy link
Collaborator

@sergio-nsk sergio-nsk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be only 3 args and returned module.

@nmoinvaz nmoinvaz merged commit 2a58424 into master Dec 9, 2024
18 checks passed
@nmoinvaz nmoinvaz deleted the nathan/dev/SPTCH-3534/1 branch December 9, 2024 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants