From c876dce82b3c84551118eea425a4dd9263bcaeab Mon Sep 17 00:00:00 2001 From: Otger Date: Mon, 23 Nov 2015 21:46:55 +0100 Subject: [PATCH] Fixed crashes for Video with no content --- code/FBXConverter.cpp | 2 +- code/FBXDocument.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp index 21cb8055d..27d43e753 100644 --- a/code/FBXConverter.cpp +++ b/code/FBXConverter.cpp @@ -1499,7 +1499,7 @@ private: path.Set(tex->RelativeFilename()); const Video* media = tex->Media(); - if(media != 0) { + if(media != 0 && media->ContentLength() > 0) { unsigned int index; VideoMap::const_iterator it = textures_converted.find(media); diff --git a/code/FBXDocument.h b/code/FBXDocument.h index a149eb446..3d8f18801 100644 --- a/code/FBXDocument.h +++ b/code/FBXDocument.h @@ -701,7 +701,6 @@ public: uint8_t* RelinquishContent() { uint8_t* ptr = content; content = 0; - contentLength = 0; return ptr; }