From ad05705afb0c7f29c28916e805a681588e821c03 Mon Sep 17 00:00:00 2001
From: David Hoyt <dhoyt@llnl.gov>
Date: Mon, 22 Feb 2010 20:55:29 +0100
Subject: [PATCH] jpegdec: Fix invalid memory access by first checking and then
 reading

Fixes bug #610483.
---
 ext/jpeg/gstjpegdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 91bca55..f90911c 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -486,10 +486,10 @@ gst_jpeg_dec_parse_image_data (GstJpegDec * dec)
       GST_DEBUG ("0x%08" G_GINT64_MODIFIER "x: finding entropy segment length",
           (gint64) (data - start - 1));
       while (1) {
-        if (d2[eseglen] == 0xff && d2[eseglen + 1] != 0x00)
-          break;
         if (d2 + eseglen >= end - 1)
           return 0;             /* need more data */
+        if (d2[eseglen] == 0xff && d2[eseglen + 1] != 0x00)
+          break;
         ++eseglen;
       }
       frame_len += eseglen;
-- 
2.7.4