776130534b
Fix nullptr-dereferencing
...
- Fix a possible nullptr-exception.
2022-01-06 22:35:32 +01:00
b14b34d2b8
LWSLoader: Fix out of bounds iterator access
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
2022-01-05 15:43:16 -05:00
310c81aaa2
Add support for spanned archives
...
Without it, assimp would crash on some inputs by jumping to a NULL
opendisk function. This commit adds an opendisk implementation, which
required adding a filename member to ZipFile.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38873
Fix #4229
2022-01-05 15:43:10 -05:00
34d8fba100
Fix stack overflow in ZipArchiveIOSystem::MapArchive
...
The function allocates a filename buffer of 256, and copies the filename
extracted from the zip file into it. However, a filename might be larger
than 256 characters, in which case the function would write out of bounds.
This commit skips any file whose name is larger than 256 to avoid the
overflow.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38870
Fix #4228
2022-01-05 10:01:46 -05:00
089fc7311a
GCC might have an issue with value type Errors
2022-01-05 10:34:27 +01:00
04d2d13172
Locale independent meter scale
...
`XmlParser::getRealAttribute(...)` will call `strtod` (or `wcstod`) which are both locale dependent. So on a German locale system a scale of 0.01 meter will be parsed to 0. In order to avoid that I use the `fast_atoreal_move<ai_real>()` method.
2022-01-05 10:10:38 +01:00
87e9dbac40
Fix bone fitted check in gltf2 exporter
2022-01-03 16:32:34 -07:00
125acf9ec8
Merge remote-tracking branch 'origin/master' into common_base64
2022-01-02 19:47:57 +01:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
ab19cff328
Merge branch 'master' into pbr-obj
2021-12-31 08:33:30 +01:00
a86ab45161
Merge branch 'master' into ps-devel-fix-namespace-001
2021-12-31 08:20:24 +01:00
a099fe7cd3
BlenderScene: use explicit namespace instead of using namespace
...
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-30 18:01:54 +01:00
0a5bd792de
Merge branch 'master' into fix-fbx-metalness-import
2021-12-29 19:08:16 +01:00
81fc50f612
CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW
...
See https://discourse.cmake.org/t/cmake-compiler-is-mingw-removed/4539 and https://cmake.org/cmake/help/latest/variable/MINGW.html
2021-12-28 15:58:37 +01:00
2da06dd41a
Merge branch 'master' into fix-fbx-metalness-import
2021-12-26 17:31:33 +03:00
d44641398f
Add console progresshandler
2021-12-26 11:16:02 +01:00
d11d2fc60d
fix Inter-Quake Model (IQM) Importer MSVC warnings
2021-12-24 18:36:25 +03:00
db2500c393
MDL: Do not try to copy empty embedded texture
...
- When an embedded texture is empty, skip it instead of trying to copy it. This must fail.
- closes https://github.com/assimp/assimp/issues/4238
- Found from the Google fuzzer.
2021-12-23 12:28:43 +01:00
635153b3a4
LWS-Import: Avoid access to empty string token
...
- Fix invalid access to string pointer when string token is empty
- closes https://github.com/assimp/assimp/issues/4222
2021-12-22 21:08:28 +01:00
2c66d4d3a2
Optimize the check
2021-12-22 20:43:44 +01:00
215f4e1f4d
Fix typo
2021-12-22 20:02:29 +01:00
2eb86d75b8
Make sure no overflow can happen
...
- During UTF32 LE with BOM make sure that the byteswap operation will have enough space when iterating through the text buffer, which shall get encoded.
- closes https://github.com/assimp/assimp/issues/4230
2021-12-22 19:45:19 +01:00
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05:00
cab7b330ee
Merge branch 'master' into so-unloading
2021-12-20 17:58:18 +01:00
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
d7bf8d6e07
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
2021-12-18 14:50:22 +09:00
53968550e4
Merge branch 'master' into fix-fbx-metalness-import
2021-12-17 12:08:55 +03:00
3e97329fa1
Merge branch 'master' into cmake_no_known_features_error_fix
2021-12-16 20:27:58 +01:00
efdaf603b0
Merge branch 'master' into so-unloading
2021-12-16 14:52:58 +01:00
1afe7e6255
fix fbx import metalness
...
Can't import metalness textures in fbx importer
2021-12-16 12:09:06 +03:00
26dc168449
Merge branch 'master' into bugfix/import-crashes
2021-12-15 07:54:48 +01:00
92aef9236f
Fixed cmake error: No known features for C compiler when using the assimp library from another project.
2021-12-14 23:54:36 +03:00
003942aafe
Merge branch 'master' into copyscene_fix
2021-12-13 21:19:08 +01:00
d619f7015a
Merge branch 'master' into copyscene_fix
2021-12-13 20:08:45 +01:00
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +01:00
54e60b031e
Merge branch 'master' into master
2021-12-12 21:12:37 +01:00
4959924dab
Merge branch 'master' into copyscene_fix
2021-12-10 20:10:25 +01:00
33c6762272
Update HMPLoader.cpp
...
- Fix possible division by zero
- closes https://github.com/assimp/assimp/issues/4235
2021-12-10 14:32:45 +01:00
68682d75b5
Fix nullptr dereferencing from std::shared_ptr
...
- Finding from fuzzer
- closes https://github.com/assimp/assimp/issues/4237
2021-12-10 08:39:21 +01:00
c2297e9199
Revert "FBXConverter : Fix timescales of FBX animations"
...
The previous patch was made by misunderstanding about mTime.
It is not real time value, but time ticks.
This reverts commit b8bf1eac04
2021-12-09 10:57:39 +01:00
d2c8cb755e
Merge branch 'master' into copyscene_fix
2021-12-08 14:29:31 +01:00
e51feac2c5
Update PolyTools.h
2021-12-07 21:19:01 +01:00
1e4861f86e
Fix division by zero in PointInTriangle2D
...
- closes https://github.com/assimp/assimp/issues/4240
2021-12-07 20:45:21 +01:00
2be6bac4b0
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
2021-12-07 20:42:43 +01:00
9a7ee0ac14
Throw a DeadlyImportError rather than an assertion if all materials are redundant and thus removed
...
Closes: https://github.com/assimp/assimp/issues/4224
Closes: https://github.com/assimp/assimp/issues/4225
2021-12-07 12:35:15 +01:00
6e090c88b8
fix index variable for surfaces
...
Closes: https://github.com/assimp/assimp/issues/4209
2021-12-07 12:13:31 +01:00
5b4829155c
Merge branch 'master' into so-unloading
2021-12-04 20:28:12 +01:00
0e2ac2a91c
X3D: simplistic attempt to avoid crashes due to nullptr access
...
Related: https://github.com/assimp/assimp/issues/4201
while the crashes go away, i'm not sure whether this is the correct fix.
also, afaict the X3D importer produces wrong results anyhow
2021-12-01 12:21:29 +01:00
c8cdf3009e
X3D: replace 'here' debugging printout by an assertion.
...
if mNodeElementCur is NULL, we get a crash anyhow...
2021-12-01 12:19:19 +01:00
23d7811276
X3D: consistent initialization with nullptr
2021-12-01 11:35:06 +01:00
836963428e
Fix file-extension check for X3D-files
...
using the pre-existing and well-tested GetExtension() (which happens
to also normalize the extension), rather than attempting our own
buggy one...
Closes: https://github.com/assimp/assimp/issues/4177
2021-12-01 11:17:42 +01:00
834ec20008
Merge branch 'master' into master
2021-11-30 23:44:42 +01:00
d6f3f292f2
Merge branch 'master' into ms-maxvollmer/crashfixes2
2021-11-30 23:17:59 +01:00
4a37aa2ef8
Interpolate euler rotations for quaternion animations
...
FBX uses euler rotation but assimp library's base type is
quaternion. When assimp convert FBX some animation information
can be lost.
This patch interpolates euler-angle rotations and insert
additional keyframes for the FBX format.
2021-11-30 12:49:59 +01:00
095bd67e10
Fix memory leaks in CollectionObject by making ob a weak pointer and removing prev pointer.
...
Something was cyclic in CollectionObject and we don't traverse backwards anyways
2021-11-26 22:09:06 -04:00
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
44fa1ec6a7
Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93
2021-11-26 22:09:06 -04:00
0015823bef
Reject files with an invalid byteLength value
2021-11-26 13:01:15 +00:00
38382715f7
Ensure we don't access the vector with an out of bounds index
2021-11-26 13:01:00 +00:00
1a5d66714f
Prevent out-of-range memory writes by sparse accessors
...
This turned up during fuzz testing. Corrupted data would make assimp write to random memory locations, leading to subsequent crashes.
2021-11-25 11:20:26 +01:00
690e558b88
Update IOSystem.cpp
2021-11-25 09:32:52 +01:00
8b78a63b50
Allow dlclose of so library by avoiding unique symbols.
2021-11-23 20:39:48 +01:00
60bfde78eb
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-21 23:23:22 +09:00
9ebd74bd26
Merge branch 'master' into win_dll_so_version
2021-11-20 14:16:32 +01:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
2ceb18746b
Append '-SOVERSION' to DLL base file name for mingw builds to match common style
2021-11-18 08:17:31 +01:00
74b3be194d
Read the Value, not the Attribute
...
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
2021-11-17 17:10:10 +00:00
bab8b8dbab
apply clangformat
2021-11-17 17:08:19 +00:00
c24f99cd0e
Redefine deprecated glTF-specific PBR material macros
...
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
2021-11-16 11:42:59 +00:00
b0d564467e
Merge branch 'master' into jdumas/ziplib
2021-11-14 08:25:59 -08:00
78d72bff59
Fix 3MF presence test.
2021-11-14 08:24:27 -08:00
b1c336799c
Merge branch 'master' into master
2021-11-13 09:16:27 +01:00
c3ac5569c5
Merge branch 'master' into jdumas/ziplib
2021-11-13 08:46:46 +01:00
b9937994ca
Fix glTF2 skinning bone weight exporting issue
2021-11-13 12:07:29 +08:00
6e6807ee6c
Verbose processor bone weight count fix
2021-11-13 11:56:15 +08:00
1407491a67
glTF2 exporter buffer overrun issue fix.
2021-11-13 11:52:49 +08:00
57d22e4dbf
Merge branch 'master' into jdumas/ziplib
2021-11-12 10:13:21 -08:00
159fadebbf
Update M3DExporter.cpp
2021-11-12 17:53:46 +01:00
0beacc3854
Merge branch 'master' into kimkulling-diable_m3m_issue-4126
2021-11-12 16:02:51 +01:00
f03dcc27c0
Update M3DExporter.h
2021-11-12 15:39:21 +01:00
e2ccd17494
Fix typo
2021-11-12 11:20:22 +01:00
157e032bde
Fix small findings
...
- Merge anonymous functions into one block.
- Some reformattings
2021-11-12 11:08:19 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
c22524351a
Merge branch 'master' into master
2021-11-12 09:56:56 +01:00
97b8e41997
Fix formatting
2021-11-12 09:56:45 +01:00
ece61c6c68
Update M3DWrapper.cpp
2021-11-12 09:17:32 +01:00
608bccd9cf
Update M3DWrapper.h
2021-11-12 09:13:48 +01:00
13731b37c4
Merge branch 'master' into 3ds_export_4157
2021-11-12 07:06:52 +01:00
43b0ef181a
Merge branch 'master' into fix_gltf_warning_4126
2021-11-11 20:30:07 +01:00
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
eafb79e7dc
Merge branch 'Artenuvielle-x3d_pugi_migration_artenuvielle' of https://github.com/assimp/assimp into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-11 19:06:33 +01:00
952f0a53c9
Try to fix a leak
2021-11-11 19:06:25 +01:00
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
a31c979abc
Use helloworld as X3D-Testcase
2021-11-10 20:40:05 +01:00
8ed18621db
Fixes
2021-11-10 20:37:27 +01:00
39664d608d
Merge branch 'master' into master
2021-11-10 10:51:18 +01:00
b8a10e62f9
Remove optimization fence
2021-11-09 13:08:13 -05:00
86a25b62e4
Better aiMesh ABI compatibility with 5.0.1, make smaller
...
Move new mTextureCoordsNames member to end of struct
Convert to pointer-to-array, saving ~8KB per aiMesh in almost all cases
Add C++ accessor functions for simpler usage
2021-11-09 13:03:06 +00:00
30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-09 10:53:58 +01:00
aaae3e3a10
size_t is 32bit on some platforms
...
Also assert if size_t is smaller than uint32_t (probably not necessary)
Note: 32bit builds will crash OOM if a really large model is loaded, as cannot allocate that much in total, let alone contiguously.
2021-11-08 15:05:20 +00:00
Kim Kulling
Alex Rebert
tanolino
Colin Reeder
kovacsv
Peter Seiderer
Jérôme Leclercq
Vyacheslav Vanin
Kim Kulling
Garux
Rene Sepulveda
sssaoi
rumgot
Inho Lee
IOhannes m zmölnig
Pencil Amazing
Max Vollmer (Microsoft Havok)
Jan Krassnigg
Thomas Nicky Thulesen
ruyo
Ralf Habacker
RichardTea
Jérémie Dumas
Jérémie Dumas
freizhang
Aaron Gokaslan