From 56dc45f047e936dfa57acfb1886a2a320b4af098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 27 Nov 2018 14:34:35 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20PLY=20Reader=20hang=20when=20reading=20di?=
 =?UTF-8?q?rectly=20from=20istream=20(Thanks=20to=20Paul=20Lor=C3=A9=20for?=
 =?UTF-8?q?=20the=20patch)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #46
---
 Doc/changelog.docu                       |  1 +
 src/OpenMesh/Core/IO/reader/PLYReader.cc | 20 ++++++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index a68a7daf..fe44af41 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -18,6 +18,7 @@
 <ul>
 <li>PLY Reader: Allowing the PLY reader to read custom face ( Thanks to morgan Leborgne for the patch)</li>
 <li>PLY Reader: Fixed endless loop on unknown property list type</li>
+<li>PLY Reader: Fix hang when reading directly from istream (Thanks to Paul Loré for the patch)</li>
 <li>OM Writer/Reader: Update file format version to 2.0. Older files can still be read, but older OpenMesh versions cannot read new format.</li>
 <li>OM Writer/Reader: Fixed inconsistent writing/reading of edge properties</li>
 <li>OM Writer/Reader: Add option to store status</li>
diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc
index 37e605a7..33718ff5 100644
--- a/src/OpenMesh/Core/IO/reader/PLYReader.cc
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc
@@ -135,6 +135,14 @@ bool _PLYReader_::read(std::istream& _in, BaseImporter& _bi, Options& _opt) {
         return false;
     }
 
+    // Reparse the header
+    if (!can_u_read(_in)) {
+        omerr() << "[PLYReader] : Unable to parse header\n";
+        return false;
+    }
+
+
+
     // filter relevant options for reading
     bool swap = _opt.check(Options::Swap);
 
@@ -281,12 +289,6 @@ void _PLYReader_::readCustomProperty(std::istream& _in, BaseImporter& _bi, Handl
 
 bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options& _opt) const {
 
-    // Reparse the header
-    if (!can_u_read(_in)) {
-        omerr() << "[PLYReader] : Unable to parse header\n";
-        return false;
-    }
-
     unsigned int i, j, k, l, idx;
     unsigned int nV;
     OpenMesh::Vec3f v, n;
@@ -507,12 +509,6 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
 
 bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap*/, const Options& _opt) const {
 
-    // Reparse the header
-    if (!can_u_read(_in)) {
-        omerr() << "[PLYReader] : Unable to parse header\n";
-        return false;
-    }
-
     OpenMesh::Vec3f        v, n;  // Vertex
     OpenMesh::Vec2f        t;  // TexCoords
     BaseImporter::VHandles vhandles;