diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2014-09-27 23:05:36 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-09-27 23:35:12 +0400 |
| commit | e1afaa02bfa88bc03296ae5a424b1a4274b0fe11 (patch) | |
| tree | 3d66542789add26b40dcbe65448cee1cbeace052 /source/blender/blenkernel | |
| parent | 8e4fdba19c7e091a3e8fdf42bbed79413e5b1af9 (diff) | |
Fix T41974: blender ships vulnerable minilzo version
Update lzo library due to security issue
Update lzo to latest version. This fixes a security issue (reported in T41974)
This also fixes some (false-positive) valgrind warnings.
Reviewers: sergey
Differential Revision: https://developer.blender.org/D803
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 063a81e6efb..a6a7664ec61 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -85,11 +85,12 @@ #ifdef WITH_LZO #include "minilzo.h" -#else -/* used for non-lzo cases */ -#define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) +#define LZO_HEAP_ALLOC(var,size) \ + lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] #endif +#define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) + #ifdef WITH_LZMA #include "LzmaLib.h" #endif |