From: Turo Lamminen <turotl@gmail.com>
Date: Mon, 18 Sep 2017 12:13:19 +0000 (+0300)
Subject: PlyLoader: Fix operator precedence issue in header check
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b74fc9495aeb35346a0b941de3f984d17eebd3dc;p=platform%2Fupstream%2Fassimp.git

PlyLoader: Fix operator precedence issue in header check

The previous version might read past end of buffer
---

diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp
index d348fe1..c6e862b 100644
--- a/code/PlyLoader.cpp
+++ b/code/PlyLoader.cpp
@@ -170,9 +170,10 @@ void PLYImporter::InternReadFile(const std::string& pFile,
   std::vector<char> headerCheck;
   streamedBuffer.getNextLine(headerCheck);
 
-  if ((headerCheck.size() >= 3) && (headerCheck[0] != 'P' && headerCheck[0] != 'p') ||
-    (headerCheck[1] != 'L' && headerCheck[1] != 'l') ||
-    (headerCheck[2] != 'Y' && headerCheck[2] != 'y'))
+  if ((headerCheck.size() < 3) ||
+      (headerCheck[0] != 'P' && headerCheck[0] != 'p') ||
+      (headerCheck[1] != 'L' && headerCheck[1] != 'l') ||
+      (headerCheck[2] != 'Y' && headerCheck[2] != 'y') )
   {
     streamedBuffer.close();
     throw DeadlyImportError("Invalid .ply file: Magic number \'ply\' is no there");