summaryrefslogtreecommitdiff
path: root/cogl/cogl-buffer.c
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-10-18 18:50:02 +0100
committerRobert Bragg <robert@linux.intel.com>2010-10-26 16:40:54 +0100
commit525504f9bf82eac89a0950c134544aa7ef034d64 (patch)
tree66368621375ea1d61c2e2b854554d26e6b533fd4 /cogl/cogl-buffer.c
parentaafcee31b20d8afe6b91fa84a30de855b07f2020 (diff)
downloadcogl-525504f9bf82eac89a0950c134544aa7ef034d64.tar.gz
buffer: warn if (offset + size) > buffer->size
previously we would silently bail out if the given offset + data size would overflow the buffer size. Now we use g_return_val_if_fail so we get a warning if we hit this case.
Diffstat (limited to 'cogl/cogl-buffer.c')
-rw-r--r--cogl/cogl-buffer.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/cogl/cogl-buffer.c b/cogl/cogl-buffer.c
index b1d72423..2c2baedf 100644
--- a/cogl/cogl-buffer.c
+++ b/cogl/cogl-buffer.c
@@ -458,11 +458,8 @@ cogl_buffer_set_data (CoglBuffer *buffer,
const guint8 *data,
gsize size)
{
- if (!cogl_is_buffer (buffer))
- return FALSE;
-
- if (G_UNLIKELY((offset + size) > buffer->size))
- return FALSE;
+ g_return_val_if_fail (cogl_is_buffer (buffer), FALSE);
+ g_return_val_if_fail ((offset + size) <= buffer->size, FALSE);
return buffer->vtable.set_data (buffer, offset, data, size);
}