diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-12 20:47:40 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-12 20:47:40 +0000 |
| commit | 562c0fb6f1898925cc5232bc40454f66417af6e4 (patch) | |
| tree | ace88d9220d507579e7771f75f5ab1097f5edd34 /source/Irrlicht/CPLYMeshFileLoader.cpp | |
| parent | 20b3d56987ca7b7a9d7f27b0a32a93f12e8dc530 (diff) | |
| download | irrlicht-562c0fb6f1898925cc5232bc40454f66417af6e4.tar.xz | |
Merging r6107 through r6116 from trunk to ogl-es branch
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'source/Irrlicht/CPLYMeshFileLoader.cpp')
| -rw-r--r-- | source/Irrlicht/CPLYMeshFileLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/Irrlicht/CPLYMeshFileLoader.cpp b/source/Irrlicht/CPLYMeshFileLoader.cpp index f154095..94cbace 100644 --- a/source/Irrlicht/CPLYMeshFileLoader.cpp +++ b/source/Irrlicht/CPLYMeshFileLoader.cpp @@ -572,7 +572,7 @@ c8* CPLYMeshFileLoader::getNextLine() StartPointer = LineEndPointer + 1;
// crlf split across buffer move
- if (*StartPointer == '\n')
+ if (StartPointer<EndPointer && *StartPointer == '\n')
{
*StartPointer = '\0';
++StartPointer;
@@ -583,7 +583,7 @@ c8* CPLYMeshFileLoader::getNextLine() while (pos < EndPointer && *pos && *pos != '\r' && *pos != '\n')
++pos;
- if ( pos < EndPointer && ( *(pos+1) == '\r' || *(pos+1) == '\n') )
+ if ( (pos+1) < EndPointer && ( *(pos+1) == '\r' || *(pos+1) == '\n') )
{
*pos = '\0';
++pos;
|