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 /extern/lzo/minilzo/minilzo.h | |
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 'extern/lzo/minilzo/minilzo.h')
-rw-r--r-- | extern/lzo/minilzo/minilzo.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/extern/lzo/minilzo/minilzo.h b/extern/lzo/minilzo/minilzo.h index f2c104856e3..79374546748 100644 --- a/extern/lzo/minilzo/minilzo.h +++ b/extern/lzo/minilzo/minilzo.h @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -50,7 +35,7 @@ #ifndef __MINILZO_H #define __MINILZO_H 1 -#define MINILZO_VERSION 0x2060 +#define MINILZO_VERSION 0x2080 #ifdef __LZOCONF_H # error "you cannot use both LZO and miniLZO" @@ -78,7 +63,7 @@ extern "C" { */ #define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS -#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t)) +#define LZO1X_1_MEM_COMPRESS ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t)) #define LZO1X_MEM_DECOMPRESS (0) @@ -101,11 +86,6 @@ lzo1x_decompress_safe ( const lzo_bytep src, lzo_uint src_len, lzo_voidp wrkmem /* NOT USED */ ); -#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) ] - #ifdef __cplusplus } /* extern "C" */ #endif |