diff --git a/ChangeLog b/ChangeLog
index 8fc5ba732..e4af514d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-07  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftglyph.c (FT_Glyph_Copy): Fix initialization of
+	`target'.  Reported by Sean McBride.
+
 2007-07-06  Werner Lemberg  <wl@gnu.org>
 
 	* src/pfr/pfrcmap.c: Include pfrerror.h.
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 969c5dbb0..db0e79fca 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -376,10 +376,16 @@
     const FT_Glyph_Class*  clazz;
 
 
+    /* check arguments */
+    if ( !target )
+    {
+      error = FT_Err_Invalid_Argument;
+      goto Exit;
+    }
+
     *target = 0;
 
-    /* check arguments */
-    if ( !target || !source || !source->clazz )
+    if ( !source || !source->clazz )
     {
       error = FT_Err_Invalid_Argument;
       goto Exit;