Mesa (master): mesa: Add asserts to check inputs to memcpy.
Vinson Lee
vlee at kemper.freedesktop.org
Sun Feb 28 04:11:58 UTC 2010
Module: Mesa
Branch: master
Commit: 75dba756b2e3d6850b56376d7c183dc3277a563b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=75dba756b2e3d6850b56376d7c183dc3277a563b
Author: Vinson Lee <vlee at vmware.com>
Date: Sat Feb 27 20:11:31 2010 -0800
mesa: Add asserts to check inputs to memcpy.
---
src/mesa/main/mipmap.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 89b8c5a..21ee317 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -979,6 +979,7 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
if (border) {
/* copy left-most pixel from source */
+ assert(dstPtr);
assert(srcPtr);
memcpy(dstPtr, srcPtr, bpt);
/* copy right-most pixel from source */
@@ -1026,6 +1027,8 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
if (border > 0) {
/* fill in dest border */
/* lower-left border pixel */
+ assert(dstPtr);
+ assert(srcPtr);
memcpy(dstPtr, srcPtr, bpt);
/* lower-right border pixel */
memcpy(dstPtr + (dstWidth - 1) * bpt,
More information about the mesa-commit
mailing list