3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of a warning in expat parser, which turns to an error

Browse Source 
on some Perl/XS installations (strawberry Perl 64bit)
This commit is contained in:
bubnikv 2017-02-26 23:35:44 +01:00
parent 616788a600
commit 9ea570ea4e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xs/src/expat/xmlparse.c
View File

@ -710,8 +710,11 @@ generate_hash_secret_salt(XML_Parser parser)
{ {
/* Process ID is 0 bits entropy if attacker has local access /* Process ID is 0 bits entropy if attacker has local access
* XML_Parser address is few bits of entropy if attacker has local access */ * XML_Parser address is few bits of entropy if attacker has local access */
// Prusa3D specific: Fix for a following warning, which turns to an error on some Perl/XS installations:
// error: cast from 'XML_Parser' to 'long unsigned int' loses precision [-fpermissive]
unsigned long *parser_addr = (unsigned long*)&parser;
const unsigned long entropy = const unsigned long entropy =
gather_time_entropy() ^ getpid() ^ (unsigned long)parser; gather_time_entropy() ^ getpid() ^ *parser_addr;
/* Factors are 2^31-1 and 2^61-1 (Mersenne primes M31 and M61) */ /* Factors are 2^31-1 and 2^61-1 (Mersenne primes M31 and M61) */
if (sizeof(unsigned long) == 4) { if (sizeof(unsigned long) == 4) {