ct-ng bundled patch: 0002-012_check_ldrunpath_length.patch

This commit is contained in:
Anton Maklakov
2018-06-29 20:37:32 +08:00
committed by Alexey Lapshin
parent beb2cdbcda
commit cedb176cff

View File

@@ -1130,6 +1130,8 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
&& command_line.rpath == NULL) && command_line.rpath == NULL)
{ {
path = (const char *) getenv ("LD_RUN_PATH"); path = (const char *) getenv ("LD_RUN_PATH");
if (path && *path == '\0')
path = NULL;
if (path if (path
&& ldelf_search_needed (path, &n, force, && ldelf_search_needed (path, &n, force,
is_linux, elfsize)) is_linux, elfsize))
@@ -1805,6 +1807,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
rpath = command_line.rpath; rpath = command_line.rpath;
if (rpath == NULL) if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH"); rpath = (const char *) getenv ("LD_RUN_PATH");
if (rpath && *rpath == '\0')
rpath = NULL;
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)