← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to malloc/mtrace.c

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
malloc/mtrace.c
309
309
  /* When compiling the GNU libc we use the secure getenv function
310
310
     which prevents the misuse in case of SUID or SGID enabled
311
311
     programs.  */
312
 
  mallfile = __secure_getenv (mallenv);
 
312
  mallfile = __libc_secure_getenv (mallenv);
313
313
#else
314
314
  mallfile = getenv (mallenv);
315
315
#endif
364
364
  if (mallstream == NULL)
365
365
    return;
366
366
 
367
 
  fprintf (mallstream, "= End\n");
368
 
  fclose (mallstream);
 
367
  /* Do the reverse of what done in mtrace: first reset the hooks and
 
368
     MALLSTREAM, and only after that write the trailer and close the
 
369
     file.  */
 
370
  FILE *f = mallstream;
369
371
  mallstream = NULL;
370
372
  __free_hook = tr_old_free_hook;
371
373
  __malloc_hook = tr_old_malloc_hook;
372
374
  __realloc_hook = tr_old_realloc_hook;
373
375
  __memalign_hook = tr_old_memalign_hook;
 
376
 
 
377
  fprintf (f, "= End\n");
 
378
  fclose (f);
374
379
}