소스 검색

Merge pull request #3929 from TinyTinni/issue_3711

Fix non skipped CR in header parsing for binary PLY
Kim Kulling 4 년 전
부모
커밋
9be76c1ba5
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      code/AssetLib/Ply/PlyParser.cpp

+ 2 - 1
code/AssetLib/Ply/PlyParser.cpp

@@ -419,7 +419,8 @@ bool PLY::DOM::ParseHeader(IOStreamBuffer<char> &streamBuffer, std::vector<char>
         if (PLY::Element::ParseElement(streamBuffer, buffer, &out)) {
         if (PLY::Element::ParseElement(streamBuffer, buffer, &out)) {
             // add the element to the list of elements
             // add the element to the list of elements
             alElements.push_back(out);
             alElements.push_back(out);
-        } else if (TokenMatch(buffer, "end_header", 10)) {
+        } else if ( TokenMatch(buffer, "end_header\r", 11) || //checks for header end with /r/n ending
+                    TokenMatch(buffer, "end_header", 10)) { //checks for /n ending, if it doesn't end with /r/n
             // we have reached the end of the header
             // we have reached the end of the header
             break;
             break;
         } else {
         } else {