mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
539 lines
16 KiB
C
539 lines
16 KiB
C
/* Copyright (C) 2000-2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
* Memory sub-system, written by Bjorn Benson
|
|
Fixed to use my_sys scheme by Michael Widenius
|
|
|
|
[This posting refers to an article entitled "oops, corrupted memory
|
|
again!" in net.lang.c. I am posting it here because it is source.]
|
|
|
|
My tool for approaching this problem is to build another level of data
|
|
abstraction on top of malloc() and free() that implements some checking.
|
|
This does a number of things for you:
|
|
- Checks for overruns and underruns on allocated data
|
|
- Keeps track of where in the program the memory was malloc'ed
|
|
- Reports on pieces of memory that were not free'ed
|
|
- Records some statistics such as maximum memory used
|
|
- Marks newly malloc'ed and newly free'ed memory with special values
|
|
You can use this scheme to:
|
|
- Find bugs such as overrun, underrun, etc because you know where
|
|
a piece of data was malloc'ed and where it was free'ed
|
|
- Find bugs where memory was not free'ed
|
|
- Find bugs where newly malloc'ed memory is used without initializing
|
|
- Find bugs where newly free'ed memory is still used
|
|
- Determine how much memory your program really uses
|
|
- and other things
|
|
|
|
To implement my scheme you must have a C compiler that has __LINE__ and
|
|
__FILE__ macros. If your compiler doesn't have these then (a) buy another:
|
|
compilers that do are available on UNIX 4.2bsd based systems and the PC,
|
|
and probably on other machines; or (b) change my scheme somehow. I have
|
|
recomendations on both these points if you would like them (e-mail please).
|
|
|
|
There are 4 functions in my package:
|
|
char *NEW( uSize ) Allocate memory of uSize bytes
|
|
(equivalent to malloc())
|
|
char *REA( pPtr, uSize) Allocate memory of uSize bytes, move data and
|
|
free pPtr.
|
|
(equivalent to realloc())
|
|
FREE( pPtr ) Free memory allocated by NEW
|
|
(equivalent to free())
|
|
TERMINATE(file) End system, report errors and stats on file
|
|
I personally use two more functions, but have not included them here:
|
|
char *STRSAVE( sPtr ) Save a copy of the string in dynamic memory
|
|
char *RENEW( pPtr, uSize )
|
|
(equivalent to realloc())
|
|
|
|
*/
|
|
|
|
#ifndef SAFEMALLOC
|
|
#define SAFEMALLOC /* Get protos from my_sys */
|
|
#endif
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include "my_static.h"
|
|
#include "mysys_err.h"
|
|
|
|
ulonglong sf_malloc_mem_limit= ~(ulonglong)0;
|
|
|
|
#ifndef PEDANTIC_SAFEMALLOC
|
|
/*
|
|
Set to 1 after TERMINATE() if we had to fiddle with sf_malloc_count and
|
|
the linked list of blocks so that _sanity() will not fuss when it
|
|
is not supposed to
|
|
*/
|
|
static int sf_malloc_tampered= 0;
|
|
#endif
|
|
|
|
|
|
/* Static functions prototypes */
|
|
|
|
static int check_ptr(const char *where, byte *ptr, const char *sFile,
|
|
uint uLine);
|
|
static int _checkchunk(struct st_irem *pRec, const char *sFile, uint uLine);
|
|
|
|
/*
|
|
Note: We only fill up the allocated block. This do not include
|
|
malloc() roundoff or the extra space required by the irem
|
|
structures.
|
|
*/
|
|
|
|
/*
|
|
NEW'ed memory is filled with this value so that references to it will
|
|
end up being very strange.
|
|
*/
|
|
#define ALLOC_VAL (uchar) 0xA5
|
|
/*
|
|
FEEE'ed memory is filled with this value so that references to it will
|
|
end up being very strange.
|
|
*/
|
|
#define FREE_VAL (uchar) 0x8F
|
|
#define MAGICKEY 0x14235296 /* A magic value for underrun key */
|
|
|
|
/*
|
|
Warning: do not change the MAGICEND? values to something with the
|
|
high bit set. Various C compilers (like the 4.2bsd one) do not do
|
|
the sign extension right later on in this code and you will get
|
|
erroneous errors.
|
|
*/
|
|
|
|
#define MAGICEND0 0x68 /* Magic values for overrun keys */
|
|
#define MAGICEND1 0x34 /* " */
|
|
#define MAGICEND2 0x7A /* " */
|
|
#define MAGICEND3 0x15 /* " */
|
|
|
|
|
|
/* Allocate some memory. */
|
|
|
|
gptr _mymalloc(uint size, const char *filename, uint lineno, myf MyFlags)
|
|
{
|
|
struct st_irem *irem;
|
|
char *data;
|
|
DBUG_ENTER("_mymalloc");
|
|
DBUG_PRINT("enter",("Size: %u",size));
|
|
|
|
if (!sf_malloc_quick)
|
|
(void) _sanity (filename, lineno);
|
|
|
|
if (size + sf_malloc_cur_memory > sf_malloc_mem_limit)
|
|
irem= 0;
|
|
else
|
|
{
|
|
/* Allocate the physical memory */
|
|
irem= (struct st_irem *) malloc (ALIGN_SIZE(sizeof(struct st_irem)) +
|
|
sf_malloc_prehunc +
|
|
size + /* size requested */
|
|
4 + /* overrun mark */
|
|
sf_malloc_endhunc);
|
|
}
|
|
/* Check if there isn't anymore memory avaiable */
|
|
if (!irem)
|
|
{
|
|
if (MyFlags & MY_FAE)
|
|
error_handler_hook=fatal_error_handler_hook;
|
|
if (MyFlags & (MY_FAE+MY_WME))
|
|
{
|
|
char buff[SC_MAXWIDTH];
|
|
my_errno=errno;
|
|
sprintf(buff,"Out of memory at line %d, '%s'", lineno, filename);
|
|
my_message(EE_OUTOFMEMORY,buff,MYF(ME_BELL+ME_WAITTANG));
|
|
sprintf(buff,"needed %d byte (%ldk), memory in use: %ld bytes (%ldk)",
|
|
size, (size + 1023L) / 1024L,
|
|
sf_malloc_max_memory, (sf_malloc_max_memory + 1023L) / 1024L);
|
|
my_message(EE_OUTOFMEMORY,buff,MYF(ME_BELL+ME_WAITTANG));
|
|
}
|
|
DBUG_PRINT("error",("Out of memory, in use: %ld at line %d, '%s'",
|
|
sf_malloc_max_memory,lineno, filename));
|
|
if (MyFlags & MY_FAE)
|
|
exit(1);
|
|
DBUG_RETURN ((gptr) 0);
|
|
}
|
|
|
|
/* Fill up the structure */
|
|
data= (((char*) irem) + ALIGN_SIZE(sizeof(struct st_irem)) +
|
|
sf_malloc_prehunc);
|
|
*((uint32*) (data-sizeof(uint32)))= MAGICKEY;
|
|
data[size + 0]= MAGICEND0;
|
|
data[size + 1]= MAGICEND1;
|
|
data[size + 2]= MAGICEND2;
|
|
data[size + 3]= MAGICEND3;
|
|
irem->filename= (my_string) filename;
|
|
irem->linenum= lineno;
|
|
irem->datasize= size;
|
|
irem->prev= NULL;
|
|
|
|
/* Add this remember structure to the linked list */
|
|
pthread_mutex_lock(&THR_LOCK_malloc);
|
|
if ((irem->next= sf_malloc_root))
|
|
sf_malloc_root->prev= irem;
|
|
sf_malloc_root= irem;
|
|
|
|
/* Keep the statistics */
|
|
sf_malloc_cur_memory+= size;
|
|
if (sf_malloc_cur_memory > sf_malloc_max_memory)
|
|
sf_malloc_max_memory= sf_malloc_cur_memory;
|
|
sf_malloc_count++;
|
|
pthread_mutex_unlock(&THR_LOCK_malloc);
|
|
|
|
/* Set the memory to the aribtrary wierd value */
|
|
if ((MyFlags & MY_ZEROFILL) || !sf_malloc_quick)
|
|
bfill(data, size, (char) (MyFlags & MY_ZEROFILL ? 0 : ALLOC_VAL));
|
|
/* Return a pointer to the real data */
|
|
DBUG_PRINT("exit",("ptr: 0x%lx", (long) data));
|
|
if (sf_min_adress > data)
|
|
sf_min_adress= data;
|
|
if (sf_max_adress < data)
|
|
sf_max_adress= data;
|
|
DBUG_RETURN ((gptr) data);
|
|
}
|
|
|
|
|
|
/*
|
|
Allocate some new memory and move old memoryblock there.
|
|
Free then old memoryblock
|
|
*/
|
|
|
|
gptr _myrealloc(register gptr ptr, register uint size,
|
|
const char *filename, uint lineno, myf MyFlags)
|
|
{
|
|
struct st_irem *irem;
|
|
char *data;
|
|
DBUG_ENTER("_myrealloc");
|
|
|
|
if (!ptr && (MyFlags & MY_ALLOW_ZERO_PTR))
|
|
DBUG_RETURN(_mymalloc(size, filename, lineno, MyFlags));
|
|
|
|
if (!sf_malloc_quick)
|
|
(void) _sanity (filename, lineno);
|
|
|
|
if (check_ptr("Reallocating", (byte*) ptr, filename, lineno))
|
|
DBUG_RETURN((gptr) NULL);
|
|
|
|
irem= (struct st_irem *) (((char*) ptr) - ALIGN_SIZE(sizeof(struct st_irem))-
|
|
sf_malloc_prehunc);
|
|
if (*((uint32*) (((char*) ptr)- sizeof(uint32))) != MAGICKEY)
|
|
{
|
|
fprintf(stderr, "Error: Reallocating unallocated data at line %d, '%s'\n",
|
|
lineno, filename);
|
|
DBUG_PRINT("safe",("Reallocating unallocated data at line %d, '%s'",
|
|
lineno, filename));
|
|
(void) fflush(stderr);
|
|
DBUG_RETURN((gptr) NULL);
|
|
}
|
|
|
|
if ((data= _mymalloc(size,filename,lineno,MyFlags))) /* Allocate new area */
|
|
{
|
|
size=min(size, irem->datasize); /* Move as much as possibly */
|
|
memcpy((byte*) data, ptr, (size_t) size); /* Copy old data */
|
|
_myfree(ptr, filename, lineno, 0); /* Free not needed area */
|
|
}
|
|
else
|
|
{
|
|
if (MyFlags & MY_HOLD_ON_ERROR)
|
|
DBUG_RETURN(ptr);
|
|
if (MyFlags & MY_FREE_ON_ERROR)
|
|
_myfree(ptr, filename, lineno, 0);
|
|
}
|
|
DBUG_RETURN(data);
|
|
} /* _myrealloc */
|
|
|
|
|
|
/* Deallocate some memory. */
|
|
|
|
void _myfree(gptr ptr, const char *filename, uint lineno, myf myflags)
|
|
{
|
|
struct st_irem *irem;
|
|
DBUG_ENTER("_myfree");
|
|
DBUG_PRINT("enter",("ptr: 0x%lx", (long) ptr));
|
|
|
|
if (!sf_malloc_quick)
|
|
(void) _sanity (filename, lineno);
|
|
|
|
if ((!ptr && (myflags & MY_ALLOW_ZERO_PTR)) ||
|
|
check_ptr("Freeing",(byte*) ptr,filename,lineno))
|
|
DBUG_VOID_RETURN;
|
|
|
|
/* Calculate the address of the remember structure */
|
|
irem= (struct st_irem *) ((char*) ptr- ALIGN_SIZE(sizeof(struct st_irem))-
|
|
sf_malloc_prehunc);
|
|
|
|
/*
|
|
Check to make sure that we have a real remember structure.
|
|
Note: this test could fail for four reasons:
|
|
(1) The memory was already free'ed
|
|
(2) The memory was never new'ed
|
|
(3) There was an underrun
|
|
(4) A stray pointer hit this location
|
|
*/
|
|
|
|
if (*((uint32*) ((char*) ptr- sizeof(uint32))) != MAGICKEY)
|
|
{
|
|
fprintf(stderr, "Error: Freeing unallocated data at line %d, '%s'\n",
|
|
lineno, filename);
|
|
DBUG_PRINT("safe",("Unallocated data at line %d, '%s'",lineno,filename));
|
|
(void) fflush(stderr);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/* Remove this structure from the linked list */
|
|
pthread_mutex_lock(&THR_LOCK_malloc);
|
|
if (irem->prev)
|
|
irem->prev->next= irem->next;
|
|
else
|
|
sf_malloc_root= irem->next;
|
|
|
|
if (irem->next)
|
|
irem->next->prev= irem->prev;
|
|
/* Handle the statistics */
|
|
sf_malloc_cur_memory-= irem->datasize;
|
|
sf_malloc_count--;
|
|
pthread_mutex_unlock(&THR_LOCK_malloc);
|
|
|
|
#ifndef HAVE_purify
|
|
/* Mark this data as free'ed */
|
|
if (!sf_malloc_quick)
|
|
bfill(ptr, irem->datasize, (pchar) FREE_VAL);
|
|
#endif
|
|
*((uint32*) ((char*) ptr- sizeof(uint32)))= ~MAGICKEY;
|
|
/* Actually free the memory */
|
|
free((char*) irem);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/* Check if we have a wrong pointer */
|
|
|
|
static int check_ptr(const char *where, byte *ptr, const char *filename,
|
|
uint lineno)
|
|
{
|
|
if (!ptr)
|
|
{
|
|
fprintf(stderr, "Error: %s NULL pointer at line %d, '%s'\n",
|
|
where,lineno, filename);
|
|
DBUG_PRINT("safe",("Null pointer at line %d '%s'", lineno, filename));
|
|
(void) fflush(stderr);
|
|
return 1;
|
|
}
|
|
#ifndef _MSC_VER
|
|
if ((long) ptr & (ALIGN_SIZE(1)-1))
|
|
{
|
|
fprintf(stderr, "Error: %s wrong aligned pointer at line %d, '%s'\n",
|
|
where,lineno, filename);
|
|
DBUG_PRINT("safe",("Wrong aligned pointer at line %d, '%s'",
|
|
lineno,filename));
|
|
(void) fflush(stderr);
|
|
return 1;
|
|
}
|
|
#endif
|
|
if (ptr < sf_min_adress || ptr > sf_max_adress)
|
|
{
|
|
fprintf(stderr, "Error: %s pointer out of range at line %d, '%s'\n",
|
|
where,lineno, filename);
|
|
DBUG_PRINT("safe",("Pointer out of range at line %d '%s'",
|
|
lineno,filename));
|
|
(void) fflush(stderr);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
TERMINATE(FILE *file)
|
|
Report on all the memory pieces that have not been
|
|
free'ed as well as the statistics.
|
|
*/
|
|
|
|
void TERMINATE(FILE *file)
|
|
{
|
|
struct st_irem *irem;
|
|
DBUG_ENTER("TERMINATE");
|
|
pthread_mutex_lock(&THR_LOCK_malloc);
|
|
|
|
/*
|
|
Report the difference between number of calls to
|
|
NEW and the number of calls to FREE. >0 means more
|
|
NEWs than FREEs. <0, etc.
|
|
*/
|
|
|
|
if (sf_malloc_count)
|
|
{
|
|
if (file)
|
|
{
|
|
fprintf(file, "Warning: Not freed memory segments: %u\n",
|
|
sf_malloc_count);
|
|
(void) fflush(file);
|
|
}
|
|
DBUG_PRINT("safe",("sf_malloc_count: %u", sf_malloc_count));
|
|
}
|
|
|
|
/*
|
|
Report on all the memory that was allocated with NEW
|
|
but not free'ed with FREE.
|
|
*/
|
|
|
|
if ((irem= sf_malloc_root))
|
|
{
|
|
if (file)
|
|
{
|
|
fprintf(file, "Warning: Memory that was not free'ed (%ld bytes):\n",
|
|
sf_malloc_cur_memory);
|
|
(void) fflush(file);
|
|
}
|
|
DBUG_PRINT("safe",("Memory that was not free'ed (%ld bytes):",
|
|
sf_malloc_cur_memory));
|
|
while (irem)
|
|
{
|
|
char *data= (((char*) irem) + ALIGN_SIZE(sizeof(struct st_irem)) +
|
|
sf_malloc_prehunc);
|
|
if (file)
|
|
{
|
|
fprintf(file,
|
|
"\t%6u bytes at 0x%09lx, allocated at line %4u in '%s'",
|
|
irem->datasize, (long) data, irem->linenum, irem->filename);
|
|
fprintf(file, "\n");
|
|
(void) fflush(file);
|
|
}
|
|
DBUG_PRINT("safe",
|
|
("%6u bytes at 0x%09lx, allocated at line %4d in '%s'",
|
|
irem->datasize, (long) data, irem->linenum, irem->filename));
|
|
irem= irem->next;
|
|
}
|
|
}
|
|
/* Report the memory usage statistics */
|
|
if (file)
|
|
{
|
|
fprintf(file, "Maximum memory usage: %ld bytes (%ldk)\n",
|
|
sf_malloc_max_memory, (sf_malloc_max_memory + 1023L) / 1024L);
|
|
(void) fflush(file);
|
|
}
|
|
DBUG_PRINT("safe",("Maximum memory usage: %ld bytes (%ldk)",
|
|
sf_malloc_max_memory, (sf_malloc_max_memory + 1023L) /
|
|
1024L));
|
|
pthread_mutex_unlock(&THR_LOCK_malloc);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Returns 0 if chunk is ok */
|
|
|
|
static int _checkchunk(register struct st_irem *irem, const char *filename,
|
|
uint lineno)
|
|
{
|
|
int flag=0;
|
|
char *magicp, *data;
|
|
|
|
data= (((char*) irem) + ALIGN_SIZE(sizeof(struct st_irem)) +
|
|
sf_malloc_prehunc);
|
|
/* Check for a possible underrun */
|
|
if (*((uint32*) (data- sizeof(uint32))) != MAGICKEY)
|
|
{
|
|
fprintf(stderr, "Error: Memory allocated at %s:%d was underrun,",
|
|
irem->filename, irem->linenum);
|
|
fprintf(stderr, " discovered at %s:%d\n", filename, lineno);
|
|
(void) fflush(stderr);
|
|
DBUG_PRINT("safe",("Underrun at 0x%lx, allocated at %s:%d",
|
|
(long) data, irem->filename, irem->linenum));
|
|
flag=1;
|
|
}
|
|
|
|
/* Check for a possible overrun */
|
|
magicp= data + irem->datasize;
|
|
if (*magicp++ != MAGICEND0 ||
|
|
*magicp++ != MAGICEND1 ||
|
|
*magicp++ != MAGICEND2 ||
|
|
*magicp++ != MAGICEND3)
|
|
{
|
|
fprintf(stderr, "Error: Memory allocated at %s:%d was overrun,",
|
|
irem->filename, irem->linenum);
|
|
fprintf(stderr, " discovered at '%s:%d'\n", filename, lineno);
|
|
(void) fflush(stderr);
|
|
DBUG_PRINT("safe",("Overrun at 0x%lx, allocated at %s:%d",
|
|
(long) data,
|
|
irem->filename,
|
|
irem->linenum));
|
|
flag=1;
|
|
}
|
|
return(flag);
|
|
}
|
|
|
|
|
|
/* Returns how many wrong chunks */
|
|
|
|
int _sanity(const char *filename, uint lineno)
|
|
{
|
|
reg1 struct st_irem *irem;
|
|
reg2 int flag=0;
|
|
uint count=0;
|
|
|
|
pthread_mutex_lock(&THR_LOCK_malloc);
|
|
#ifndef PEDANTIC_SAFEMALLOC
|
|
if (sf_malloc_tampered && (int) sf_malloc_count < 0)
|
|
sf_malloc_count=0;
|
|
#endif
|
|
count=sf_malloc_count;
|
|
for (irem= sf_malloc_root; irem != NULL && count-- ; irem= irem->next)
|
|
flag+= _checkchunk (irem, filename, lineno);
|
|
pthread_mutex_unlock(&THR_LOCK_malloc);
|
|
if (count || irem)
|
|
{
|
|
const char *format="Error: Safemalloc link list destroyed, discovered at '%s:%d'";
|
|
fprintf(stderr, format, filename, lineno); fputc('\n',stderr);
|
|
fprintf(stderr, "root=%p,count=%d,irem=%p\n", sf_malloc_root,count,irem);
|
|
(void) fflush(stderr);
|
|
DBUG_PRINT("safe",(format, filename, lineno));
|
|
flag=1;
|
|
}
|
|
return flag;
|
|
} /* _sanity */
|
|
|
|
|
|
/* malloc and copy */
|
|
|
|
gptr _my_memdup(const byte *from, uint length, const char *filename,
|
|
uint lineno, myf MyFlags)
|
|
{
|
|
gptr ptr;
|
|
if ((ptr=_mymalloc(length,filename,lineno,MyFlags)) != 0)
|
|
memcpy((byte*) ptr, (byte*) from,(size_t) length);
|
|
return(ptr);
|
|
} /*_my_memdup */
|
|
|
|
|
|
char *_my_strdup(const char *from, const char *filename, uint lineno,
|
|
myf MyFlags)
|
|
{
|
|
gptr ptr;
|
|
uint length=(uint) strlen(from)+1;
|
|
if ((ptr=_mymalloc(length,filename,lineno,MyFlags)) != 0)
|
|
memcpy((byte*) ptr, (byte*) from,(size_t) length);
|
|
return((char*) ptr);
|
|
} /* _my_strdup */
|
|
|
|
|
|
char *_my_strdup_with_length(const char *from, uint length,
|
|
const char *filename, uint lineno,
|
|
myf MyFlags)
|
|
{
|
|
gptr ptr;
|
|
if ((ptr=_mymalloc(length+1,filename,lineno,MyFlags)) != 0)
|
|
{
|
|
memcpy((byte*) ptr, (byte*) from,(size_t) length);
|
|
ptr[length]=0;
|
|
}
|
|
return((char *) ptr);
|
|
}
|