v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,565 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

11565 Commits (ef5dd8c451b2d36cb95ed3c3fb57569a6c9903df)

Author SHA1 Message Date
Kim Kulling ef5dd8c451
Merge branch 'master' into kimkulling/move_asserthandler_to_include_issue-4779 2022-12-23 16:29:30 +01:00
Kim Kulling a8e50be781 Refactoring: Move asserthandler header to include 2022-12-23 16:19:39 +01:00
Kim Kulling 883667c61a
Merge pull request #4848 from assimp/kimkulling/unzip_fix_compiler_warning 
Update unzip.c
 2022-12-23 14:07:04 +01:00
Kim Kulling 89b5011759
Update unzip.c 
- Fix compiler warning.
 2022-12-23 13:50:16 +01:00
Kim Kulling 022c385571
Merge pull request #4846 from rohit-kumar-j/patch-1 
illegal token on right-side-of ::Windows
 2022-12-19 09:49:20 +01:00
Kim Kulling 76de8ba1f4
Update material.inl 2022-12-19 08:58:45 +01:00
RKJ 6743274b31
illegal token on right-side-of ::Windows 
Error without:
```
assimp\material.inl(101,47): message : error recovery skipped: ') ?'
```

Reference : https://stackoverflow.com/questions/2561368/illegal-token-on-right-side-of
 2022-12-19 04:06:36 +05:30
Kim Kulling 1e2cff6383
Merge pull request #4824 from umesh-huawei/master 
Fixed bug when exporting binary FBX
 2022-12-16 11:25:31 +01:00
Kim Kulling 376f66a06d
Merge branch 'master' into master 2022-12-16 10:11:56 +01:00
Kim Kulling 5c763f471c
Merge pull request #4838 from sashashura/patch-10 
Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace
 2022-12-16 09:18:23 +01:00
Kim Kulling c3d15a3f51
Fix minor review findings. 2022-12-16 09:03:40 +01:00
Kim Kulling c92b84e38d
Merge branch 'master' into patch-10 2022-12-16 09:00:41 +01:00
Kim Kulling 7c6e33fef1
Merge pull request #4837 from sashashura/patch-9 
Fixes Heap-buffer-overflow READ 1 in Assimp::MD5::MD5Parser::ParseHeader
 2022-12-15 15:08:16 +01:00
Kim Kulling db8ff41679
Update MD5Parser.cpp 2022-12-15 14:06:57 +01:00
Kim Kulling 2612950b7b
Merge branch 'master' into patch-9 2022-12-15 14:05:35 +01:00
Kim Kulling ee02c389ca
Merge pull request #4836 from sashashura/patch-8 
Fixes Heap-buffer-overflow READ 4 in Assimp::ScenePreprocessor::ProcssMesh
 2022-12-15 14:04:19 +01:00
sashashura 917352dd8b
Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49274
 2022-12-11 01:54:57 +01:00
Alex 90769ef3e6
Fixes Heap-buffer-overflow READ 1 in Assimp::MD5::MD5Parser::ParseHeader 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49422
When it reaches the `SkipSpacesAndLineEnd`, `in` already points past `bufferEnd` and it leads to out of bounds memory read.
 2022-12-11 00:02:09 +00:00
Alex d5294be00b
Fixes Heap-buffer-overflow READ 4 in Assimp::ScenePreprocessor::ProcessMesh 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49797
 2022-12-10 01:22:00 +00:00
Umesh Rajesh Ramchandani 2d372b302f Fixed bug when exporting binary FBX 
Fixed vector subscript out of range bug when NULL_RECORD is passed to PutString and is actually null
 2022-12-08 14:59:25 +01:00
Kim Kulling 0fdae2879d
Merge pull request #4825 from Gargaj/floatwarnings 
fix warnings-as-errors for msvc 2019 x64
 2022-12-08 14:48:54 +01:00
Kim Kulling fec39154ed
Merge branch 'master' into floatwarnings 2022-12-08 14:18:35 +01:00
Kim Kulling b2b85bf971
Merge pull request #4832 from assimp/kimkulling/fix_heap_overflow_issue-4831 
Ensure face pointer is not nullptr
 2022-12-08 09:50:24 +01:00
Kim Kulling 769b47ed0e
Ensure face pointer is not nullptr 
- closes https://github.com/assimp/assimp/issues/4831
 2022-12-08 09:35:11 +01:00
Kim Kulling 65bedac389
Merge pull request #4829 from assimp/kimkulling/avoid_undefined_shift_issue-4822 
Avoid undefined-shift in Assimp::ASE::Parser::ParseLV4MeshFace.
 2022-12-05 13:31:31 +01:00
Kim Kulling 9d57ac9cc5 Fix:Add missing semicolon. 2022-12-05 13:15:42 +01:00
Kim Kulling 81f85a6f93 Avoid undefined-shift in Assimp::ASE::Parser::ParseLV4MeshFace. 2022-12-05 13:07:52 +01:00
Gargaj 9c839f2d9a more fixes 2022-12-03 20:44:57 +01:00
Gargaj 07d4e83f43 fix warnings-as-errors for msvc x64 2022-12-03 20:27:00 +01:00
Kim Kulling 28c155bfb4
Merge pull request #4820 from assimp/kimkulling/MDL_fix_division_by_zero_issue-4819 
FIX: Fix possible division by zero
 2022-12-02 10:00:12 +01:00
Kim Kulling f8bb7704ad
Fix: MAke quaternion check in unittest more robust 
Just add an epsilon test by using the correct comparator from gtest.
 2022-12-02 09:43:59 +01:00
Kim Kulling 62486c6e7c
FIX: Fix possible division by zero 
- closes https://github.com/assimp/assimp/issues/4819
 2022-12-02 09:24:51 +01:00
Kim Kulling b0987f4513
Merge pull request #4816 from tkoeppe/explspec 
[BlenderDNA.h] Declare explicit specializations
 2022-11-30 15:07:11 +01:00
Kim Kulling f578b15759
Merge branch 'master' into explspec 2022-11-30 14:03:09 +01:00
Kim Kulling 497e286cfa
Merge pull request #4792 from Skylion007/modernize-smartptrs-literals 
Modernize smartptrs and use C++11 literals
 2022-11-29 20:32:02 +01:00
Thomas Köppe 7d06d798af [BlenderDNA.h] Declare explicit specializations 
It is an ODR violation to use a template specialization for which an
explicit specialization is defined somewhere whose declaration is not
visible at the point of use.

Found via clang's -Wundefined-func-template warning.
 2022-11-29 18:38:33 +00:00
Kim Kulling 8fb7ba3444
Merge branch 'master' into modernize-smartptrs-literals 2022-11-29 09:58:17 +01:00
Kim Kulling 6f6f77232e
Merge pull request #4813 from assimp/kimkulling/improve_github_parallel_build 
Introduce --parallel instead of .j
 2022-11-29 09:57:52 +01:00
Kim Kulling 22cff318dc
Introduce --parallel instead of .j 
Just use parallel command to improve the readability.
 2022-11-29 09:34:56 +01:00
Kim Kulling b6adb9f2dd
Merge pull request #4805 from CMDR-JohnAlex/patch-1 
Fixed some grammar and spelling mistakes
 2022-11-22 23:49:46 +01:00
Kim Kulling 8f0e2db974
Merge branch 'master' into patch-1 2022-11-22 20:51:07 +01:00
Kim Kulling 10b99dc4ca
Merge pull request #4807 from DavidKorczynski/cifuzz-int 
Add CIFuzz GitHub action
 2022-11-22 20:46:51 +01:00
Kim Kulling 1476d50c7d
Merge branch 'master' into cifuzz-int 2022-11-22 19:10:03 +01:00
Kim Kulling 88041152ac
Merge pull request #4809 from assimp/kimkulling/fix_possible_overflow_issue-3422 
Add overfolow check for invalid data.
 2022-11-22 11:04:51 +01:00
Kim Kulling 5689ac7869
Add overfolow check for invalid data. 
- closes https://github.com/assimp/assimp/issues/3422
 2022-11-22 10:50:52 +01:00
David Korczynski 355ebbedf3 Add CIFuzz GitHub action 2022-11-21 16:45:38 -08:00
Kim Kulling b3daec65a0
Merge pull request #4787 from Beilinson/KHR_materials_emissive_strength 
Added support for KHR_materials_emissive_strength
 2022-11-21 23:51:55 +01:00
John Alexander Le Roux 80449dd014
Fixed some grammar and spelling mistakes 2022-11-21 15:51:21 -05:00
Kim Kulling 1d1cd93371
Merge branch 'master' into KHR_materials_emissive_strength 2022-11-21 20:55:13 +01:00
Kim Kulling 6392dbfe4d
Merge pull request #4801 from jakrams/fbx-out-of-memory-fix 
Don't hide out-of-memory during FBX import
 2022-11-18 20:40:59 +01:00