commit da48f300e691d2ed205888ace1b87090f642fb2d
author Xiang, Haihao <haihao.xiang@intel.com> Wed Jun 10 14:41:14 2015 +0800
committer Xiang, Haihao <haihao.xiang@intel.com> Wed Jun 24 13:23:53 2015 +0800
tree dea4be771b14f9924e62685d6357f5f41f1dad92
parent eaaa4e76b1ad935a9a728805de9345d372d4046c

test/decode/tinyjpeg: make sure the pointer is valid before dereferencing it

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: Sean V Kelley <seanvk@posteo.de>
(cherry picked from commit 8455834161bab3374fe9756fd4a28d919027daf7)

test/decode/tinyjpeg.c

diff --git a/test/decode/tinyjpeg.c b/test/decode/tinyjpeg.c
index 33dcdc6..f53d083 100644
--- a/test/decode/tinyjpeg.c
+++ b/test/decode/tinyjpeg.c
@@ -387,7 +387,7 @@
 
 static int findEOI(struct jdec_private *priv,const unsigned char *stream)
 {
-   while (!(*stream == 0xff  && *(stream+1) == 0xd9 )&& stream<=priv->stream_end) //searching for the end of image marker
+   while (stream<=priv->stream_end&& !(*stream == 0xff  && *(stream+1) == 0xd9 )) //searching for the end of image marker
    {
       stream++;
       continue;