diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 22:41:42 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 22:41:42 +0000 |
| commit | 07aa910d904da92ba9d461d4f867b9438ace6ce0 (patch) | |
| tree | 4c4efa14aa4a652b9a27724f1d79f4a73d3ba77e /third_party/libpng/pngrtran.c | |
| parent | f4145d43019e7ba00c539e54ac7fb57944f17915 (diff) | |
| download | chromium_src-07aa910d904da92ba9d461d4f867b9438ace6ce0.zip chromium_src-07aa910d904da92ba9d461d4f867b9438ace6ce0.tar.gz chromium_src-07aa910d904da92ba9d461d4f867b9438ace6ce0.tar.bz2 | |
Security bug for libpng, update needed to 1.2.36
There's a new version of libpng, 1.2.36 which fixes a security bug. Chrome/Chromium still runs on 1.2.35 it seems
BUG=13046
TEST=Ran tests
Review URL: http://codereview.chromium.org/112080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/pngrtran.c')
| -rw-r--r-- | third_party/libpng/pngrtran.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/third_party/libpng/pngrtran.c b/third_party/libpng/pngrtran.c index a916f54..d7dd8e7 100644 --- a/third_party/libpng/pngrtran.c +++ b/third_party/libpng/pngrtran.c @@ -455,10 +455,8 @@ png_set_dither(png_structp png_ptr, png_colorp palette, int num_green = (1 << PNG_DITHER_GREEN_BITS); int num_blue = (1 << PNG_DITHER_BLUE_BITS); png_size_t num_entries = ((png_size_t)1 << total_bits); - png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr, (png_uint_32)(num_entries * png_sizeof(png_byte))); - png_memset(png_ptr->palette_lookup, 0, num_entries * png_sizeof(png_byte)); @@ -4125,14 +4123,13 @@ png_build_gamma_table(png_structp png_ptr) png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p))); + png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND)) { double fin, fout; png_uint_32 last, max; - png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); - for (i = 0; i < num; i++) { png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr, @@ -4187,7 +4184,6 @@ png_build_gamma_table(png_structp png_ptr) png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p ))); - png_memset(png_ptr->gamma_16_to_1, 0, num * png_sizeof(png_uint_16p)); for (i = 0; i < num; i++) @@ -4212,7 +4208,6 @@ png_build_gamma_table(png_structp png_ptr) png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p))); - png_memset(png_ptr->gamma_16_from_1, 0, num * png_sizeof(png_uint_16p)); |