mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-28 23:34:53 +03:00 
			
		
		
		
	2000-09-18 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.1.94. * malloc/mtrace.c (mtrace): Mark stream as close on exec. 2000-09-17 Bruno Haible <haible@clisp.cons.org> * iconvdata/utf-16.c (BODY for TO_LOOP): Reject UCS-4 input in the range 0xD800..0xDFFF. * iconvdata/unicode.c (BODY for TO_LOOP): Likewise. (BODY for FROM_LOOP): Likewise. * iconv/gconv_simple.c (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Likewise. (ucs2reverse_internal_loop): Likewise. (internal_ucs2reverse_loop): Likewise. 2000-09-17 Bruno Haible <haible@clisp.cons.org> * iconvdata/utf-16.c (gconv_init): Add missing slashes to encoding names. 2000-09-17 Bruno Haible <haible@clisp.cons.org> * iconvdata/tst-table-from.c (main): Fix test for error on stdout. * iconvdata/tst-table-to.c (main): Likewise. 2000-09-17 Bruno Haible <haible@clisp.cons.org> * iconvdata/iso-ir-165.c (__isoir165_from_tab): Renamed from __isoir165_tab. * iconvdata/cns11643.h (__cns11643l1_to_ucs4_tab): New declaration. * iconvdata/iso-2022-cn-ext.c: Include "cns11643.h". (GB7590_set, GB13132_set, CNS11643_3_set, CNS11643_4_set, CNS11643_5_set, CNS11643_6_set, CNS11643_7_set): Change enum values. (BODY for FROM_LOOP): Fix buffer overrun. Treat CNS11643 plane 3. Return __GCONV_INCOMPLETE_INPUT instead of __GCONV_EMPTY_INPUT. (BODY for TO_LOOP): Fix usage of `set' vs. `used'. Fix typo that caused GB2312 to be used instead of ISO-IR-165. Treat CNS11643 plane 3. Fix shift sequences. Output announcement for SS2 and SS3 encodings when needed. When outputting an announcement, don't clear most other announcements. 2000-09-17 Bruno Haible <haible@clisp.cons.org> * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Fix buffer overrun. (BODY for TO_LOOP): Fix usage of `set' vs. `used'. 2000-09-14 Bruno Haible <haible@clisp.cons.org> * intl/Versions: Add bind_textdomain_codeset.
		
			
				
	
	
		
			311 lines
		
	
	
		
			8.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			311 lines
		
	
	
		
			8.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* More debugging hooks for `malloc'.
 | |
|    Copyright (C) 1991,92,93,94,96,97,98,99,2000 Free Software Foundation, Inc.
 | |
| 		 Written April 2, 1991 by John Gilmore of Cygnus Support.
 | |
| 		 Based on mcheck.c by Mike Haertel.
 | |
| 
 | |
|    This library is free software; you can redistribute it and/or
 | |
|    modify it under the terms of the GNU Library General Public License as
 | |
|    published by the Free Software Foundation; either version 2 of the
 | |
|    License, or (at your option) any later version.
 | |
| 
 | |
|    This library is distributed in the hope that it will be useful,
 | |
|    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|    Library General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU Library General Public
 | |
|    License along with this library; see the file COPYING.LIB.  If not,
 | |
|    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 | |
|    Boston, MA 02111-1307, USA.
 | |
| 
 | |
|    The author may be reached (Email) at the address mike@ai.mit.edu,
 | |
|    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
 | |
| 
 | |
| #ifndef	_MALLOC_INTERNAL
 | |
| #define	_MALLOC_INTERNAL
 | |
| #include <malloc.h>
 | |
| #include <mcheck.h>
 | |
| #include <bits/libc-lock.h>
 | |
| #endif
 | |
| 
 | |
| #include <dlfcn.h>
 | |
| #include <fcntl.h>
 | |
| #include <stdio.h>
 | |
| #include <string.h>
 | |
| #include <stdlib.h>
 | |
| 
 | |
| #include <stdio-common/_itoa.h>
 | |
| 
 | |
| #ifdef USE_IN_LIBIO
 | |
| # include <libio/iolibio.h>
 | |
| # define setvbuf(s, b, f, l) _IO_setvbuf (s, b, f, l)
 | |
| #endif
 | |
| 
 | |
| #define TRACE_BUFFER_SIZE 512
 | |
| 
 | |
| static FILE *mallstream;
 | |
| static const char mallenv[]= "MALLOC_TRACE";
 | |
| static char malloc_trace_buffer[TRACE_BUFFER_SIZE];
 | |
| 
 | |
| __libc_lock_define_initialized (static, lock);
 | |
| 
 | |
| /* Address to breakpoint on accesses to... */
 | |
| __ptr_t mallwatch;
 | |
| 
 | |
| /* File name and line number information, for callers that had
 | |
|    the foresight to call through a macro.  */
 | |
| char *_mtrace_file;
 | |
| int _mtrace_line;
 | |
| 
 | |
| /* Old hook values.  */
 | |
| static void (*tr_old_free_hook) __P ((__ptr_t ptr, const __ptr_t));
 | |
| static __ptr_t (*tr_old_malloc_hook) __P ((__malloc_size_t size,
 | |
| 					   const __ptr_t));
 | |
| static __ptr_t (*tr_old_realloc_hook) __P ((__ptr_t ptr,
 | |
| 					    __malloc_size_t size,
 | |
| 					    const __ptr_t));
 | |
| 
 | |
| /* This function is called when the block being alloc'd, realloc'd, or
 | |
|    freed has an address matching the variable "mallwatch".  In a debugger,
 | |
|    set "mallwatch" to the address of interest, then put a breakpoint on
 | |
|    tr_break.  */
 | |
| 
 | |
| void tr_break __P ((void));
 | |
| void
 | |
| tr_break ()
 | |
| {
 | |
| }
 | |
| 
 | |
| static void tr_where __P ((const __ptr_t)) internal_function;
 | |
| static void
 | |
| internal_function
 | |
| tr_where (caller)
 | |
|      const __ptr_t caller;
 | |
| {
 | |
|   if (_mtrace_file)
 | |
|     {
 | |
|       fprintf (mallstream, "@ %s:%d ", _mtrace_file, _mtrace_line);
 | |
|       _mtrace_file = NULL;
 | |
|     }
 | |
|   else if (caller != NULL)
 | |
|     {
 | |
| #ifdef HAVE_ELF
 | |
|       Dl_info info;
 | |
|       if (_dl_addr (caller, &info))
 | |
| 	{
 | |
| 	  char *buf = (char *) "";
 | |
| 	  if (info.dli_sname && info.dli_sname[0])
 | |
| 	    {
 | |
| 	      size_t len = strlen (info.dli_sname);
 | |
| 	      buf = alloca (len + 6 + 2 * sizeof (void *));
 | |
| 
 | |
| 	      buf[0] = '(';
 | |
| 	      __stpcpy (_fitoa (caller >= (const __ptr_t) info.dli_saddr
 | |
| 				? caller - (const __ptr_t) info.dli_saddr
 | |
| 				: (const __ptr_t) info.dli_saddr - caller,
 | |
| 				__stpcpy (__mempcpy (buf + 1, info.dli_sname,
 | |
| 						     len),
 | |
| 					  caller >= (__ptr_t) info.dli_saddr
 | |
| 					  ? "+0x" : "-0x"),
 | |
| 				16, 0),
 | |
| 			")");
 | |
| 	    }
 | |
| 
 | |
| 	  fprintf (mallstream, "@ %s%s%s[%p] ",
 | |
| 		   info.dli_fname ?: "", info.dli_fname ? ":" : "",
 | |
| 		   buf, caller);
 | |
| 	}
 | |
|       else
 | |
| #endif
 | |
| 	fprintf (mallstream, "@ [%p] ", caller);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void tr_freehook __P ((__ptr_t, const __ptr_t));
 | |
| static void
 | |
| tr_freehook (ptr, caller)
 | |
|      __ptr_t ptr;
 | |
|      const __ptr_t caller;
 | |
| {
 | |
|   if (ptr == NULL)
 | |
|     return;
 | |
|   __libc_lock_lock (lock);
 | |
|   tr_where (caller);
 | |
|   /* Be sure to print it first.  */
 | |
|   fprintf (mallstream, "- %p\n", ptr);
 | |
|   __libc_lock_unlock (lock);
 | |
|   if (ptr == mallwatch)
 | |
|     tr_break ();
 | |
|   __libc_lock_lock (lock);
 | |
|   __free_hook = tr_old_free_hook;
 | |
|   if (tr_old_free_hook != NULL)
 | |
|     (*tr_old_free_hook) (ptr, caller);
 | |
|   else
 | |
|     free (ptr);
 | |
|   __free_hook = tr_freehook;
 | |
|   __libc_lock_unlock (lock);
 | |
| }
 | |
| 
 | |
| static __ptr_t tr_mallochook __P ((__malloc_size_t, const __ptr_t));
 | |
| static __ptr_t
 | |
| tr_mallochook (size, caller)
 | |
|      __malloc_size_t size;
 | |
|      const __ptr_t caller;
 | |
| {
 | |
|   __ptr_t hdr;
 | |
| 
 | |
|   __libc_lock_lock (lock);
 | |
| 
 | |
|   __malloc_hook = tr_old_malloc_hook;
 | |
|   if (tr_old_malloc_hook != NULL)
 | |
|     hdr = (__ptr_t) (*tr_old_malloc_hook) (size, caller);
 | |
|   else
 | |
|     hdr = (__ptr_t) malloc (size);
 | |
|   __malloc_hook = tr_mallochook;
 | |
| 
 | |
|   tr_where (caller);
 | |
|   /* We could be printing a NULL here; that's OK.  */
 | |
|   fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
 | |
| 
 | |
|   __libc_lock_unlock (lock);
 | |
| 
 | |
|   if (hdr == mallwatch)
 | |
|     tr_break ();
 | |
| 
 | |
|   return hdr;
 | |
| }
 | |
| 
 | |
| static __ptr_t tr_reallochook __P ((__ptr_t, __malloc_size_t, const __ptr_t));
 | |
| static __ptr_t
 | |
| tr_reallochook (ptr, size, caller)
 | |
|      __ptr_t ptr;
 | |
|      __malloc_size_t size;
 | |
|      const __ptr_t caller;
 | |
| {
 | |
|   __ptr_t hdr;
 | |
| 
 | |
|   if (ptr == mallwatch)
 | |
|     tr_break ();
 | |
| 
 | |
|   __libc_lock_lock (lock);
 | |
| 
 | |
|   __free_hook = tr_old_free_hook;
 | |
|   __malloc_hook = tr_old_malloc_hook;
 | |
|   __realloc_hook = tr_old_realloc_hook;
 | |
|   if (tr_old_realloc_hook != NULL)
 | |
|     hdr = (__ptr_t) (*tr_old_realloc_hook) (ptr, size, caller);
 | |
|   else
 | |
|     hdr = (__ptr_t) realloc (ptr, size);
 | |
|   __free_hook = tr_freehook;
 | |
|   __malloc_hook = tr_mallochook;
 | |
|   __realloc_hook = tr_reallochook;
 | |
| 
 | |
|   tr_where (caller);
 | |
|   if (hdr == NULL)
 | |
|     /* Failed realloc.  */
 | |
|     fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long int) size);
 | |
|   else if (ptr == NULL)
 | |
|     fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
 | |
|   else
 | |
|     {
 | |
|       fprintf (mallstream, "< %p\n", ptr);
 | |
|       tr_where (caller);
 | |
|       fprintf (mallstream, "> %p %#lx\n", hdr, (unsigned long int) size);
 | |
|     }
 | |
| 
 | |
|   __libc_lock_unlock (lock);
 | |
| 
 | |
|   if (hdr == mallwatch)
 | |
|     tr_break ();
 | |
| 
 | |
|   return hdr;
 | |
| }
 | |
| 
 | |
| 
 | |
| #ifdef _LIBC
 | |
| extern void __libc_freeres (void);
 | |
| 
 | |
| /* This function gets called to make sure all memory the library
 | |
|    allocates get freed and so does not irritate the user when studying
 | |
|    the mtrace output.  */
 | |
| static void
 | |
| release_libc_mem (void)
 | |
| {
 | |
|   /* Only call the free function if we still are running in mtrace mode.  */
 | |
|   if (mallstream != NULL)
 | |
|     __libc_freeres ();
 | |
| }
 | |
| #endif
 | |
| 
 | |
| 
 | |
| /* We enable tracing if either the environment variable MALLOC_TRACE
 | |
|    is set, or if the variable mallwatch has been patched to an address
 | |
|    that the debugging user wants us to stop on.  When patching mallwatch,
 | |
|    don't forget to set a breakpoint on tr_break!  */
 | |
| 
 | |
| void
 | |
| mtrace ()
 | |
| {
 | |
| #ifdef _LIBC
 | |
|   static int added_atexit_handler;
 | |
| #endif
 | |
|   char *mallfile;
 | |
| 
 | |
|   /* Don't panic if we're called more than once.  */
 | |
|   if (mallstream != NULL)
 | |
|     return;
 | |
| 
 | |
| #ifdef _LIBC
 | |
|   /* When compiling the GNU libc we use the secure getenv function
 | |
|      which prevents the misuse in case of SUID or SGID enabled
 | |
|      programs.  */
 | |
|   mallfile = __secure_getenv (mallenv);
 | |
| #else
 | |
|   mallfile = getenv (mallenv);
 | |
| #endif
 | |
|   if (mallfile != NULL || mallwatch != NULL)
 | |
|     {
 | |
|       mallstream = fopen (mallfile != NULL ? mallfile : "/dev/null", "w");
 | |
|       if (mallstream != NULL)
 | |
| 	{
 | |
| 	  /* Make sure we close the file descriptor on exec.  */
 | |
| 	  int flags = __fcntl (fileno (mallstream), F_GETFD, 0);
 | |
| 	  if (flags >= 0)
 | |
| 	    {
 | |
| 	      flags |= FD_CLOEXEC;
 | |
| 	      __fcntl (fileno (mallstream), F_SETFD, flags);
 | |
| 	    }
 | |
| 	  /* Be sure it doesn't malloc its buffer!  */
 | |
| 	  setvbuf (mallstream, malloc_trace_buffer, _IOFBF, TRACE_BUFFER_SIZE);
 | |
| 	  fprintf (mallstream, "= Start\n");
 | |
| 	  tr_old_free_hook = __free_hook;
 | |
| 	  __free_hook = tr_freehook;
 | |
| 	  tr_old_malloc_hook = __malloc_hook;
 | |
| 	  __malloc_hook = tr_mallochook;
 | |
| 	  tr_old_realloc_hook = __realloc_hook;
 | |
| 	  __realloc_hook = tr_reallochook;
 | |
| #ifdef _LIBC
 | |
| 	  if (!added_atexit_handler)
 | |
| 	    {
 | |
| 	      added_atexit_handler = 1;
 | |
| 	      atexit (release_libc_mem);
 | |
| 	    }
 | |
| #endif
 | |
| 	}
 | |
|     }
 | |
| }
 | |
| 
 | |
| void
 | |
| muntrace ()
 | |
| {
 | |
|   if (mallstream == NULL)
 | |
|     return;
 | |
| 
 | |
|   fprintf (mallstream, "= End\n");
 | |
|   fclose (mallstream);
 | |
|   mallstream = NULL;
 | |
|   __free_hook = tr_old_free_hook;
 | |
|   __malloc_hook = tr_old_malloc_hook;
 | |
|   __realloc_hook = tr_old_realloc_hook;
 | |
| }
 |