Henri Verbeet : wined3d: Try to make Coverity shut up (CID 863, 905).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8ce2506aa84e4c7a5185226d023d7bd7a903dd91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8ce2506aa84e4c7a5185226d02...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Mar 24 10:09:21 2009 +0100

wined3d: Try to make Coverity shut up (CID 863, 905).

Comparing gl_shaders against NULL after potentially dereferencing it a few
lines earlier probably confuses Coverity. Checking num_gl_shaders instead
should avoid this.

---

 dlls/wined3d/pixelshader.c  |    3 ++-
 dlls/wined3d/vertexshader.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 68dd801..6b4a30b 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -530,7 +530,8 @@ GLuint find_gl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_
 
     TRACE("No matching GL shader found, compiling a new shader\n");
     if(shader->shader_array_size == shader->num_gl_shaders) {
-        if(shader->gl_shaders) {
+        if (shader->num_gl_shaders)
+        {
             new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2);
             new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders,
                                     new_size * sizeof(*shader->gl_shaders));
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index e8d4b84..4888c2a 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -465,7 +465,8 @@ GLuint find_gl_vshader(IWineD3DVertexShaderImpl *shader, const struct vs_compile
     TRACE("No matching GL shader found, compiling a new shader\n");
 
     if(shader->shader_array_size == shader->num_gl_shaders) {
-        if(shader->gl_shaders) {
+        if (shader->num_gl_shaders)
+        {
             new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2);
             new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders,
                                     new_size * sizeof(*shader->gl_shaders));