Mesa (master): st/mesa: Move dereference and assignment to after NULL check .

[Vinson Lee]

Module: Mesa
Branch: master
Commit: 7b8c4f22d4fd78829dd5843db92321ec0665932e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b8c4f22d4fd78829dd5843db92321ec0665932e

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Apr 15 23:15:05 2010 -0700

st/mesa: Move dereference and assignment to after NULL check.

---

 src/mesa/state_tracker/st_cb_texture.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 196bf13..9479819 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1213,10 +1213,11 @@ st_CompressedTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
    int srcBlockStride;
    int dstBlockStride;
    int y;
-   enum pipe_format pformat= stImage->pt->format;
+   enum pipe_format pformat;
 
    if (stImage->pt) {
       unsigned face = _mesa_tex_target_to_face(target);
+      pformat = stImage->pt->format;
 
       st_teximage_flush_before_map(ctx->st, stImage->pt, face, level,
 				   PIPE_TRANSFER_WRITE);