2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b95056b91b9..336af92181b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-19  Ken Raeburn  <raeburn@gnu.org>
 
+        * xfns.c (jpeg_load): Fetch error-handling data first, then fill
+        in the custom handler pointer.
+
         * keyboard.c (follow_key, read_key_sequence): Use XUINT on key
         value, or checks for CHAR_META can fail when Lisp_Object is a
         union type.
diff --git a/src/xfns.c b/src/xfns.c
index 31a3b7df1c6..8edbd66b160 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8211,8 +8211,8 @@ jpeg_load (f, img)
 
   /* Customize libjpeg's error handling to call my_error_exit when an
      error is detected.  This function will perform a longjmp.  */
-  mgr.pub.error_exit = my_error_exit;
   cinfo.err = jpeg_std_error (&mgr.pub);
+  mgr.pub.error_exit = my_error_exit;
   
   if ((rc = setjmp (mgr.setjmp_buffer)) != 0)
     {