Attachment #5253 for bug #12454

(-)b/elf/dl-close.c (-1 / +2 lines)

Lines 222-228	Link Here

222

223

224

  /* Sort the entries.  */

224

  /* Sort the entries.  */

225

  _dl_sort_fini (ns->_ns_loaded, maps, nloaded, used, nsid);

225

  if (nloaded > 1)

226

    _dl_sort_fini (ns->_ns_loaded, maps, nloaded, used, nsid);

226

227

  /* Call all termination functions at once.  */

228

  /* Call all termination functions at once.  */

228

#ifdef SHARED

229

#ifdef SHARED

(-)b/elf/dl-deps.c (-2 / +2 lines)

Lines 619-629	Link Here

619

620

  /* We can skip looking for the binary itself which is at the front

620

  /* We can skip looking for the binary itself which is at the front

621

     of the search list.  */

621

     of the search list.  */

622

  assert (nlist > 1);

622

  assert (nlist > 0);

623

  i = 1;

623

  i = 1;

624

  bool seen[nlist];

624

  bool seen[nlist];

625

  memset (seen, false, nlist * sizeof (seen[0]));

625

  memset (seen, false, nlist * sizeof (seen[0]));

626

  while (1)

626

  while (nlist > 1)

627

628

      /* Keep track of which object we looked at this round.  */

628

      /* Keep track of which object we looked at this round.  */

629

      seen[i] = true;

629

      seen[i] = true;

Return to bug 12454