From 0a263a8b3130c0156a9851f1224a63938be0adef Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 25 Nov 2008 05:44:41 +0000
Subject: [PATCH] * src/base/ftstream.c (FT_Stream_ReadFields): Don't access
 stream before the NULL check.  From Savannah patch #6681.

---
 ChangeLog           | 5 +++++
 src/base/ftstream.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc3a16650..8b2d92064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-25  Daniel Zimmermann  <netzimme@aol.com>
+
+	* src/base/ftstream.c (FT_Stream_ReadFields): Don't access stream
+	before the NULL check.  From Savannah patch #6681.
+
 2008-11-24  Werner Lemberg  <wl@gnu.org>
 
 	Fixes from the gnuwin32 port.
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index 569e46c79..cff67e0e9 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -707,12 +707,13 @@
   {
     FT_Error  error;
     FT_Bool   frame_accessed = 0;
-    FT_Byte*  cursor = stream->cursor;
-
+    FT_Byte*  cursor;
 
     if ( !fields || !stream )
       return FT_Err_Invalid_Argument;
 
+    cursor = stream->cursor;
+
     error = FT_Err_Ok;
     do
     {