gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/coin: Fix segfault with GCC-6

Browse Source 
Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378
Package-Manager: Portage-2.3.6, Repoman-2.3.2
This commit is contained in:
Peter Levine
2017-07-19 01:46:56 -04:00
committed by Alexey Shvetsov
parent c818610691
commit 4dee204fba
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-libs/coin/coin-3.1.3-r2.ebuild
View File

@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${P}-pkgconfig-partial.patch
"${FILESDIR}"/${P}-gcc-4.7.patch
"${FILESDIR}"/${P}-freetype251.patch
"${FILESDIR}"/${P}-memhandler-initialization.patch
)
DOCS=(

23
media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch Normal file
View File

@@ -0,0 +1,23 @@
Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378
Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05
--- a/src/misc/SbHash.h
+++ b/src/misc/SbHash.h
@@ -89,6 +89,8 @@
cc_memalloc_deallocate(entry->memhandler, ptr);
}
SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
+ : key(key), obj(obj), memhandler(memhandler) {}
Key key;
Type obj;
@@ -218,7 +220,7 @@
/* Key not already in the hash table; insert a new
* entry as the first element in the bucket
*/
- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
+ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
entry->next = this->buckets[i];
this->buckets[i] = entry;