Browse Source

assertion must be always valid (not only in debug mode)

v5-2
Roberto Ierusalimschy 22 years ago
parent
commit
f36038e42a
  1. 3
      lmem.c
  2. 3
      ltests.c

3
lmem.c

@ -1,5 +1,5 @@
/* /*
** $Id: lmem.c,v 1.57 2002/06/18 15:19:27 roberto Exp roberto $ ** $Id: lmem.c,v 1.58 2002/10/08 18:45:07 roberto Exp roberto $
** Interface to Memory Manager ** Interface to Memory Manager
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -61,6 +61,7 @@ void *luaM_growaux (lua_State *L, void *block, int *size, int size_elems,
** generic allocation routine. ** generic allocation routine.
*/ */
void *luaM_realloc (lua_State *L, void *block, lu_mem oldsize, lu_mem size) { void *luaM_realloc (lua_State *L, void *block, lu_mem oldsize, lu_mem size) {
lua_assert((oldsize == 0) == (block == NULL));
if (size == 0) { if (size == 0) {
if (block != NULL) { if (block != NULL) {
l_free(block, oldsize); l_free(block, oldsize);

3
ltests.c

@ -1,5 +1,5 @@
/* /*
** $Id: ltests.c,v 1.137 2002/10/22 18:07:55 roberto Exp roberto $ ** $Id: ltests.c,v 1.138 2002/10/25 20:05:28 roberto Exp roberto $
** Internal Module for Debugging of the Lua Implementation ** Internal Module for Debugging of the Lua Implementation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -95,7 +95,6 @@ static void freeblock (void *block) {
void *debug_realloc (void *block, size_t oldsize, size_t size) { void *debug_realloc (void *block, size_t oldsize, size_t size) {
lua_assert((oldsize == 0) == (block == NULL));
lua_assert(oldsize == 0 || oldsize == *blocksize(block)); lua_assert(oldsize == 0 || oldsize == *blocksize(block));
/* ISO does not specify what realloc(NULL, 0) does */ /* ISO does not specify what realloc(NULL, 0) does */
lua_assert(block != NULL || size > 0); lua_assert(block != NULL || size > 0);

Loading…
Cancel
Save