From: Rob Herring Date: Thu, 1 Jun 2017 00:07:40 +0000 (-0500) Subject: glsl: fix bounds check in blob_overwrite_bytes X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18348a383dae41567fd333db6f848fbc8ff7d99b;p=mesa.git glsl: fix bounds check in blob_overwrite_bytes clang gives a warning in blob_overwrite_bytes because offset type is size_t which is unsigned: src/compiler/glsl/blob.c:110:15: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare] if (offset < 0 || blob->size - offset < to_write) ~~~~~~ ^ ~ Remove the less than 0 check to fix this. Additionally, if offset is greater than blob->size, the 2nd check would be false due to unsigned math. Rewrite the check to avoid subtraction. Reviewed-by: Ian Romanick Signed-off-by: Rob Herring --- diff --git a/src/compiler/glsl/blob.c b/src/compiler/glsl/blob.c index 769ebf1a023..db362520650 100644 --- a/src/compiler/glsl/blob.c +++ b/src/compiler/glsl/blob.c @@ -107,7 +107,7 @@ blob_overwrite_bytes(struct blob *blob, size_t to_write) { /* Detect an attempt to overwrite data out of bounds. */ - if (offset < 0 || blob->size - offset < to_write) + if (blob->size < offset + to_write) return false; memcpy(blob->data + offset, bytes, to_write);