diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-30 07:00:58 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-30 07:00:58 +0000 |
commit | 000e6ad3dea9fe04759c7d27ea9ae500eccdc4bc (patch) | |
tree | a8afaa98c8beab93ea2d383fba9b01ed6821946e /render/box.c | |
parent | b579b0deb39c067f19bebcb4acfb29d7ef87f258 (diff) | |
download | netsurf-000e6ad3dea9fe04759c7d27ea9ae500eccdc4bc.tar.gz netsurf-000e6ad3dea9fe04759c7d27ea9ae500eccdc4bc.tar.bz2 |
It turns out that realloc(ptr, 0) --> free(ptr) is not actually required by the C standard (whereas realloc(NULL, size) --> malloc(size) is).
Therefore, explicitly model the behaviour expected by our libraries (that realloc of 0 size is equivalent to free).
svn path=/trunk/netsurf/; revision=10524
Diffstat (limited to 'render/box.c')
-rw-r--r-- | render/box.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/render/box.c b/render/box.c index 9bb7e59fe..e61dee8ff 100644 --- a/render/box.c +++ b/render/box.c @@ -51,6 +51,24 @@ struct box_duplicate_llist { static struct box_duplicate_llist *box_duplicate_last = NULL; /** + * Allocator + * + * \param ptr Pointer to reallocate, or NULL for new allocation + * \param size Number of bytes requires + * \param pw Allocation context + * \return Pointer to allocated block, or NULL on failure + */ +void *box_style_alloc(void *ptr, size_t len, void *pw) +{ + if (len == 0) { + free(ptr); + return NULL; + } + + return realloc(ptr, len); +} + +/** * Destructor for box nodes which own styles * * @param b The box being destroyed. |