From d12af175af666ccdee79212541ae69996f09af4e Mon Sep 17 00:00:00 2001
From: Marko Arandjelovic <marandje@amd.com>
Date: Thu, 6 Jun 2024 17:07:07 +0200
Subject: [PATCH] SWDEV-441296 - Fixes related to hipTexObjectCreate unit test

 - Avoid potential division by zero
 - Nullptr check

Change-Id: Ic857eb4fe968173c852eb7a67934e33fc74c055f
---
 hipamd/src/hip_texture.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hipamd/src/hip_texture.cpp b/hipamd/src/hip_texture.cpp
index 80b4f149cc..e7db6f730f 100644
--- a/hipamd/src/hip_texture.cpp
+++ b/hipamd/src/hip_texture.cpp
@@ -121,7 +121,7 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject,
   if ((pResDesc->resType == hipResourceTypeLinear) &&
       ((pResDesc->res.linear.devPtr == nullptr) ||
        (!amd::isMultipleOf(pResDesc->res.linear.devPtr, info.imageBaseAddressAlignment_)) ||
-       ((pResDesc->res.linear.sizeInBytes / hip::getElementSize(pResDesc->res.linear.desc)) >= info.imageMaxBufferSize_))) {
+       (pResDesc->res.linear.sizeInBytes >= info.imageMaxBufferSize_ * hip::getElementSize(pResDesc->res.linear.desc)))) {
     return hipErrorInvalidValue;
   }
 
@@ -308,7 +308,10 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject,
                             0, /* offset */
                             buffer,
                             status);
-    buffer->release();
+    if (buffer != nullptr) {
+      buffer->release();
+    }
+
     if (image == nullptr) {
       return status;
     }