Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,593 Commits 19 Branches 43 Tags
6c95fe19d08403531d6f1a8a3e2c49a681766fde
Commit Graph

11593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kazuki Y
6c95fe19d0 Merge branch 'master' into fix-artifact 2022-12-29 23:46:13 +09:00
Kazuki Y
26e4ab2a23 Merge branch 'assimp:master' into master 2022-12-29 23:44:30 +09:00
Kazuki Y
a84bf34cbb Update ccpp.yml 2022-12-29 23:43:07 +09:00
Kazuki Y
cd0bbe15af Merge branch 'master' into fix-artifact 2022-12-28 22:07:07 +09:00
Kim Kulling
7eadcebc9f Merge pull request #4850 from assimp/kimkulling/move_asserthandler_to_include_issue-4779 
Refactoring: Move asserthandler header to include
 2022-12-23 16:57:37 +01:00
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
Kazuki Y
d04dd1af9b Merge branch 'master' into fix-artifact 2022-12-21 22:35:35 +09:00
Kazuki Y
b406ce6707 Merge branch 'assimp:master' into master 2022-12-20 19:24:15 +09: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
Kazuki Y
2c87088079 Update ccpp.yml 2022-12-17 21:49:28 +09:00
Kazuki Y
2ec097b862 Update ccpp.yml 2022-12-17 21:06:36 +09:00
Kazuki Y
dd313da24f Update ccpp.yml 2022-12-17 21:04:11 +09:00
Kazuki Y
5925dcd0e2 Update ccpp.yml 2022-12-17 15:08:25 +09:00
Kazuki Y
9b644494ed Merge branch 'assimp:master' into master 2022-12-17 15:00:20 +09:00
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
Kazuki Y
b1a700dbbc Merge pull request #1 from NeosSharedProject/TestPatch 
Update ccpp.yml
 2022-12-12 12:43:51 +09:00
Kazuki Y
f77db867b5 Update ccpp.yml 2022-12-12 12:43:34 +09:00
kazu0617
4b523e99c4 fix ccpp.yml - build both hunter or not 2022-12-12 12:13:37 +09:00
kazu0617
53f0d5dcbd fix ccpp.yml -- fix matrix.name check for artifact 2022-12-12 10:55:13 +09:00
Kazuki Y
bbfc9f4658 upload/release対象のartifactを修正 
追加当時のIssueを参考に修正(当時はHunterなかったっぽい)
a9a0c30932
 2022-12-12 10:34:45 +09: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
Kazuki Y
fde8bf1071 buildする方についてwindows-msvcのついている方にした 
この二つ、何の違いがあるかいまいち理解してない…
clでビルドするかhunterでビルドするかの違い？
 2022-12-10 17:37:49 +09: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
Kazuki Y
cf3be00fd3 Update ccpp.yml 2022-12-09 17:42:45 +09:00
Kazuki Y
1f8f4da97c Merge branch 'assimp:master' into master 2022-12-09 16:21:11 +09:00
Kazuki Y
b9cf35ea3a Update ccpp.yml 2022-12-09 16:20:49 +09:00
Kazuki Y
09375a386a Update ccpp.yml 2022-12-09 10:28:32 +09:00
Kazuki Y
a09a4d0518 Update ccpp.yml 2022-12-09 01:49:22 +09:00
Kazuki Y
8b73b85628 Update ccpp.yml 2022-12-09 01:34:19 +09: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
Kazuki Y
b0515a0dd0 Update ccpp.yml 2022-12-08 20:50:48 +09:00
Kazuki Y
05b9940ce3 Merge branch 'assimp:master' into master 2022-12-08 20:19:58 +09: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