>Date: Wed, 11 Sep 2013 18:27:43 -0700
>
>From: Vinson Lee <v...@freedesktop.org>
>To: mesa-dev@lists.freedesktop.org
>Subject: [Mesa-dev] [PATCH] mesa: Return nonzero length only if memcpy
> occurs.
>Message-ID: <1378949263-18169-1-git-send-email-v...@freedesktop.org>
>
>Fixes "Dereference after null check" reported by Coverity.
>
>Signed-off-by: Vinson Lee <v...@freedesktop.org>
>---
>src/mesa/main/objectlabel.c | 3 +--
>1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c
>index 90d9e09..e34df13 100644
>--- a/src/mesa/main/objectlabel.c
>+++ b/src/mesa/main/objectlabel.c
>@@ -92,10 +92,9 @@ copy_label(char **labelPtr, char *label, int *length, int
>bufSize)
>{
> int labelLen = 0;
>
>- if (*labelPtr)
>+ if (label && *labelPtr) {
> labelLen = strlen(*labelPtr);
>
>- if (label) {
> if (bufSize <= labelLen)
> labelLen = bufSize-1;
>
>--
>1.8.3.2
Hi Vinson,
Maybe you might want to also add the below quotes from the spec but I think you
need to leave the two if statements (I thought I had fixed up this NULL check
but obviously I didnt).
I think the correct code is (although I can't test this just yet):
if (label) {
+ if (*labelPtr) {
if (bufSize <= labelLen)
labelLen = bufSize-1; memcpy(label, *labelPtr, labelLen);
+ }
label[labelLen] = '\0';
"If no debug label was specified for the object then <label> will contain a
null-terminated empty string, and zero will be returned in <length>. If <label>
is NULL and <length> is non-NULL then no string will be returned and the
length of the label will be returned in <length>."
Thanks,
Tim
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
