!48 Fix CVE-2024-48425

From: @li_ning_jie 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2024-11-04 07:53:04 +00:00 committed by Gitee
commit ff5bf87f5a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions

27
CVE-2024-48425.patch Normal file
View File

@ -0,0 +1,27 @@
From ecdf8d24b85367b22ba353b4f82299d4af7f1f97 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Mon, 7 Oct 2024 10:30:45 +0200
Subject: [PATCH] SplitLargeMeshes: Fix crash (#5799)
- Fix nullptr access when rootnode of the scene is a nullptr. This can happen even if the scene stores any kind of meshes. closes https://github.com/assimp/assimp/issues/5791
---
code/SplitLargeMeshes.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/SplitLargeMeshes.cpp b/code/SplitLargeMeshes.cpp
index 5e21ec6..9a09316 100644
--- a/code/SplitLargeMeshes.cpp
+++ b/code/SplitLargeMeshes.cpp
@@ -113,6 +113,9 @@ void SplitLargeMeshesProcess_Triangle::SetupProperties( const Importer* pImp)
void SplitLargeMeshesProcess_Triangle::UpdateNode(aiNode* pcNode,
const std::vector<std::pair<aiMesh*, unsigned int> >& avList)
{
+ if (pcNode == nullptr) {
+ return;
+ }
// for every index in out list build a new entry
std::vector<unsigned int> aiEntries;
aiEntries.reserve(pcNode->mNumMeshes + 1);
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: assimp
Version: 3.3.1
Release: 20
Release: 21
Summary: Library to load and process various 3D model formats into applications.
License: BSD and MIT
URL: http://assimp.sourceforge.net
@ -13,6 +13,7 @@ Patch0005: assimp-3.3.1-install-pkgconfig.patch
Patch0006: 0001-Morph-animation-support-for-collada.patch
Patch0007: 0001-Enable-doxygen-been-properly-used-from-cmake-build-a.patch
Patch0008: 0001-Apply-mechanism-to-decide-use-for-IrrXML-external-or.patch
Patch0009: CVE-2024-48425.patch
BuildRequires: gcc-c++ boost-devel cmake dos2unix irrlicht-devel irrXML-devel
BuildRequires: doxygen poly2tri-devel gtest-devel pkgconfig(zzip-zlib-config)
BuildRequires: pkgconfig(zlib) pkgconfig(minizip) pkgconfig(python2) python2-rpm-macros
@ -116,6 +117,9 @@ install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyass
%{python3_sitelib}/pyassimp
%changelog
* Sat Oct 26 2024 liningjie <liningjie@xfusion.com> - 3.3.1-21
- Fix CVE-2024-48425
* Mon Dec 28 2020 wangxiao <wangxiao65@huawei.com> - 3.3.1-20
- Remove unnessary BuildRequire DevIL