From: kgv <kgv@opencascade.com>
Date: Tue, 5 Apr 2022 22:26:00 +0000 (+0300)
Subject: 0032912: Visualization - crash when displaying an OBJ file with missing texture file
X-Git-Tag: V7_6_2~12
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=c004c09c9ebb3fa87e5c315ffb3151d6472156cf;p=occt.git

0032912: Visualization - crash when displaying an OBJ file with missing texture file

Fix NULL dereference within Graphic3d_TextureRoot::convertToCompatible() due to wrong order of checks.
---

diff --git a/src/Graphic3d/Graphic3d_TextureRoot.cxx b/src/Graphic3d/Graphic3d_TextureRoot.cxx
index a89f32dabe..13f77134cf 100644
--- a/src/Graphic3d/Graphic3d_TextureRoot.cxx
+++ b/src/Graphic3d/Graphic3d_TextureRoot.cxx
@@ -214,9 +214,9 @@ Handle(Image_PixMap) Graphic3d_TextureRoot::GetImage (const Handle(Image_Support
 void Graphic3d_TextureRoot::convertToCompatible (const Handle(Image_SupportedFormats)& theSupported,
                                                  const Handle(Image_PixMap)& theImage)
 {
-  if (theSupported.IsNull()
-   || theSupported->IsSupported (theImage->Format())
-   || theImage.IsNull())
+  if (theImage.IsNull()
+   || theSupported.IsNull()
+   || theSupported->IsSupported (theImage->Format()))
   {
     return;
   }