mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-03-17 12:30:33 +01:00
_mesa_realloc() fix
This commit is contained in:
parent
8412c60451
commit
e9f4ee87d8
1 changed files with 7 additions and 7 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: nvfragparse.c,v 1.15 2003/03/19 05:34:25 brianp Exp $ */
|
||||
/* $Id: nvfragparse.c,v 1.16 2003/04/01 16:17:03 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -42,16 +42,16 @@
|
|||
#include "nvprogram.h"
|
||||
|
||||
|
||||
/* XXX move */
|
||||
/* XXX move into imports.[ch] eventually */
|
||||
static void *
|
||||
_mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
|
||||
{
|
||||
size_t copySize = MIN2(oldSize, newSize);
|
||||
void *newBuffer = _mesa_malloc(newSize);
|
||||
size_t bytes = MIN2(oldSize, newSize);
|
||||
if (newBuffer && bytes > 0) {
|
||||
_mesa_memcpy(newBuffer, oldBuffer, bytes);
|
||||
}
|
||||
_mesa_free(oldBuffer);
|
||||
if (newBuffer && copySize > 0)
|
||||
_mesa_memcpy(newBuffer, oldBuffer, copySize);
|
||||
if (oldBuffer)
|
||||
_mesa_free(oldBuffer);
|
||||
return newBuffer;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue