Jelajahi Sumber

ldso: add null-pointer check

There is a check for (*rpnt == NULL) a few lines above but the "else"
case performing an allocation does only exist if SHARED is not defined.
If SHARED is defined, the allocation is not performed and it may happen
(at least in theory) that *rpnt == NULL when executing

  (*rpnt)->dyn = tpnt;

Add the null-pointer check.

Signed-off-by: Frank Mehnert <frank.mehnert@kernkonzept.com>
Frank Mehnert 2 tahun lalu
induk
melakukan
8fa5437044
1 mengubah file dengan 2 tambahan dan 1 penghapusan
  1. 2 1
      ldso/ldso/dl-elf.c

+ 2 - 1
ldso/ldso/dl-elf.c

@@ -900,7 +900,8 @@ struct elf_resolve *_dl_load_elf_shared_library(unsigned int rflags,
 		_dl_memset(*rpnt, 0, sizeof(struct dyn_elf));
 	}
 #endif
-	(*rpnt)->dyn = tpnt;
+	if (*rpnt)
+		(*rpnt)->dyn = tpnt;
 	tpnt->usage_count++;
 	if (tpnt->rtld_flags & RTLD_NODELETE)
 		tpnt->usage_count++;