Attachment 11030 Details for Bug 11880 – Changed initialisation order... Removed const therefor...

[patch] Changed initialisation order... Removed const therefor...

0014-Deref-before-NULL-check-fixes.patch (text/plain), 1.57 KB, created by Roland "Test-tools" Bär on 2007-08-07 02:09:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland "Test-tools" Bär

Created: 2007-08-07 02:09:52 UTC

Size: 1.57 KB

patch

obsolete

>From 4d9935fcbdc6bf2f8faa055dd7bba08a61e61d22 Mon Sep 17 00:00:00 2001
>From: Roland Baer <roland@Vista.(none)>
>Date: Tue, 7 Aug 2007 11:52:08 +0300
>Subject: [PATCH] Deref before NULL check fixes
>Removed also const of that variables
>---
> src/mesa/shader/shader_api.c |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
>index 1a93132..a1e73ef 100644
>--- a/src/mesa/shader/shader_api.c
>+++ b/src/mesa/shader/shader_api.c
>@@ -377,7 +377,7 @@ _mesa_attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
>    struct gl_shader_program *shProg
>       = _mesa_lookup_shader_program(ctx, program);
>    struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
>-   const GLuint n = shProg->NumShaders;
>+   GLuint n;
>    GLuint i;
> 
>    if (!shProg || !sh) {
>@@ -386,6 +386,8 @@ _mesa_attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
>       return;
>    }
> 
>+   n = shProg->NumShaders;
>+
>    for (i = 0; i < n; i++) {
>       if (shProg->Shaders[i] == sh) {
>          /* already attached */
>@@ -547,7 +549,7 @@ _mesa_detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
> {
>    struct gl_shader_program *shProg
>       = _mesa_lookup_shader_program(ctx, program);
>-   const GLuint n = shProg->NumShaders;
>+   GLuint n;
>    GLuint i, j;
> 
>    if (!shProg) {
>@@ -556,6 +558,8 @@ _mesa_detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
>       return;
>    }
> 
>+   n = shProg->NumShaders;
>+
>    for (i = 0; i < n; i++) {
>       if (shProg->Shaders[i]->Name == shader) {
>          /* found it */
>-- 
>1.5.2.3
>

Actions: View | Splinter Review

Attachments on bug 11880: 11030

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.