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.

Sign up for GitHub

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

Overwrite soname in place if there is room #159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Overwrite soname in place if there is room #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/patchelf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,15 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const std::string &

debug("new SONAME is '%s'\n", newSoname.c_str());

/* If new SONAME fits in existing space, overwrite. This works around
issue #44. */
if (newSoname.size() <= sonameSize) {
debug("overwriting old SONAME with new...\n");
strcpy(soname, newSoname.c_str());
Copy link
Member

Choose a reason for hiding this comment

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

Since we already know the size of newSoname, memcpy is the better choice:

Suggested change
strcpy(soname, newSoname.c_str());
memcpy(soname, newSoname.c_str(), newSoname.size() + 1);

changed = true;
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

This functionality will have to change now @reidpr
I introduced new changes that always do this->rewriteSections(); after each changed = true This is to support multiple commands on a single invocation.

I agree that this is not an ideal tracking each return.
I would like to figure out how to do a destructor for each method and then apply this->rewriteSections(); only if changed == true.

Either way this code will produce errors for now if done with other commands.

Copy link
Contributor

Choose a reason for hiding this comment

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

I opened https://github.com/NixOS/patchelf/pull/363/files# to help make this simpler.

Copy link
Author

Choose a reason for hiding this comment

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

Hello, thanks for the heads up. I still hope (after 3 years) this PR will get merged, but I don't have time to maintain it.

}

/* Grow the .dynstr section to make room for the new SONAME. */
debug("SONAME is too long, resizing...\n");

Expand Down