mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
fixed realloc not working correctly with M_GUARD
This commit is contained in:
parent
97d3149e92
commit
dc6d5b2a41
@ -1,3 +1,8 @@
|
||||
2001-12-22 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* memory.c (realloc): Fixed realloc not working when M_GUARD is
|
||||
defined and first parameter is NULL.
|
||||
|
||||
2001-12-22 Timo Schulz <ts@winpt.org>
|
||||
|
||||
* fileutil.c (is_file_compressed): New.
|
||||
|
@ -475,9 +475,11 @@ FNAME(alloc_secure_clear)( size_t n FNAMEPRT)
|
||||
void *
|
||||
FNAME(realloc)( void *a, size_t n FNAMEPRT )
|
||||
{
|
||||
#ifdef M_GUARD
|
||||
unsigned char *p = a;
|
||||
void *b;
|
||||
|
||||
#ifdef M_GUARD
|
||||
if( a ) {
|
||||
unsigned char *p = a;
|
||||
size_t len = m_size(a);
|
||||
|
||||
if( len >= n ) /* we don't shrink for now */
|
||||
@ -489,9 +491,10 @@ FNAME(realloc)( void *a, size_t n FNAMEPRT )
|
||||
FNAME(check)(NULL FNAMEARG);
|
||||
memcpy(b, a, len );
|
||||
FNAME(free)(p FNAMEARG);
|
||||
}
|
||||
else
|
||||
b = FNAME(alloc)(n);
|
||||
#else
|
||||
void *b;
|
||||
|
||||
if( m_is_secure(a) ) {
|
||||
if( !(b = secmem_realloc( a, n )) )
|
||||
out_of_core(n,1);
|
||||
@ -501,6 +504,7 @@ FNAME(realloc)( void *a, size_t n FNAMEPRT )
|
||||
out_of_core(n,0);
|
||||
}
|
||||
#endif
|
||||
|
||||
return b;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user