diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-06 02:13:38 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-06 02:15:21 +0200 |
| commit | 714866927951e2b3ec858349449c9dfe181b1542 (patch) | |
| tree | d95ba7c927154ae79e34cae34c6d7956b356e01d | |
| parent | 1d99fde435421fd93827b8d685ad6011d658d695 (diff) | |
fix new[]/delete mismatch in collada2gltf
Found by Asan.
Change-Id: Icc73e50b7f230880dda982f1c783c86aaeaa5ca2
| -rw-r--r-- | external/collada2gltf/UnpackedTarball_collada2gltf.mk | 1 | ||||
| -rw-r--r-- | external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk index b4c05f84e87f..db4b72ff69e7 100644 --- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk +++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_file,collada2gltf,.,external/collada2gltf/G $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\ external/collada2gltf/patches/wrong_uri_usage.patch.1 \ + external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 b/external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 new file mode 100644 index 000000000000..dd1344bc077b --- /dev/null +++ b/external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 @@ -0,0 +1,12 @@ +diff -ur collada2gltf.org/GLTF/GLTFAccessorCache.cpp collada2gltf/GLTF/GLTFAccessorCache.cpp +--- collada2gltf.org/GLTF/GLTFAccessorCache.cpp 2014-07-06 02:10:04.803518202 +0200 ++++ collada2gltf/GLTF/GLTFAccessorCache.cpp 2014-07-06 02:10:58.623515999 +0200 +@@ -22,7 +22,7 @@ + } + + GLTFAccessorCache::~GLTFAccessorCache() { +- delete this->m_pData; ++ delete[] this->m_pData; + } + + bool GLTFAccessorCache::operator<(const GLTFAccessorCache& rhs) const { |