git.annexia.org
/
ocaml-ancient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error path if realloc call fails.
[ocaml-ancient.git]
/
ancient_c.c
diff --git
a/ancient_c.c
b/ancient_c.c
index
46f1769
..
58735d0
100644
(file)
--- a/
ancient_c.c
+++ b/
ancient_c.c
@@
-1,5
+1,4
@@
/* Mark objects as 'ancient' so they are taken out of the OCaml heap.
/* Mark objects as 'ancient' so they are taken out of the OCaml heap.
- * $Id: ancient_c.c,v 1.11 2006-10-31 14:39:50 rich Exp $
*/
#include <string.h>
*/
#include <string.h>
@@
-134,13
+133,15
@@
area_init_custom (area *a,
static inline int
area_append (area *a, const void *obj, size_t size)
{
static inline int
area_append (area *a, const void *obj, size_t size)
{
+ void *ptr;
while (a->n + size > a->size) {
if (a->size == 0) a->size = 256; else a->size <<= 1;
while (a->n + size > a->size) {
if (a->size == 0) a->size = 256; else a->size <<= 1;
-
a->
ptr =
+ ptr =
a->realloc
? a->realloc (a->data, a->ptr, a->size)
: realloc (a->ptr, a->size);
a->realloc
? a->realloc (a->data, a->ptr, a->size)
: realloc (a->ptr, a->size);
- if (a->ptr == 0) return -1; // Out of memory.
+ if (ptr == 0) return -1; // Out of memory.
+ a->ptr = ptr;
}
memcpy (a->ptr + a->n, obj, size);
a->n += size;
}
memcpy (a->ptr + a->n, obj, size);
a->n += size;