Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Side by Side Diff: third_party/libpng/pngpread.c

Issue 1467263003: third_party/libpng: update to 1.2.54 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 1
2 /* pngpread.c - read a png file in push mode 2 /* pngpread.c - read a png file in push mode
3 * 3 *
4 * Last changed in libpng 1.2.44 [June 26, 2010] 4 * Last changed in libpng 1.2.44 [June 26, 2010]
5 * Copyright (c) 1998-2010 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2010 Glenn Randers-Pehrson
6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
8 * 8 *
9 * This code is released under the libpng license. 9 * This code is released under the libpng license.
10 * For conditions of distribution and use, see the disclaimer 10 * For conditions of distribution and use, see the disclaimer
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 678
679 new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256; 679 new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
680 old_buffer = png_ptr->save_buffer; 680 old_buffer = png_ptr->save_buffer;
681 png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr, 681 png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
682 (png_uint_32)new_max); 682 (png_uint_32)new_max);
683 if (png_ptr->save_buffer == NULL) 683 if (png_ptr->save_buffer == NULL)
684 { 684 {
685 png_free(png_ptr, old_buffer); 685 png_free(png_ptr, old_buffer);
686 png_error(png_ptr, "Insufficient memory for save_buffer"); 686 png_error(png_ptr, "Insufficient memory for save_buffer");
687 } 687 }
688 png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size); 688 else
689 png_free(png_ptr, old_buffer); 689 {
690 png_ptr->save_buffer_max = new_max; 690 png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
691 png_free(png_ptr, old_buffer);
692 png_ptr->save_buffer_max = new_max;
693 }
691 } 694 }
692 if (png_ptr->current_buffer_size) 695 if (png_ptr->current_buffer_size)
693 { 696 {
694 png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size, 697 png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
695 png_ptr->current_buffer_ptr, png_ptr->current_buffer_size); 698 png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
696 png_ptr->save_buffer_size += png_ptr->current_buffer_size; 699 png_ptr->save_buffer_size += png_ptr->current_buffer_size;
697 png_ptr->current_buffer_size = 0; 700 png_ptr->current_buffer_size = 0;
698 } 701 }
699 png_ptr->save_buffer_ptr = png_ptr->save_buffer; 702 png_ptr->save_buffer_ptr = png_ptr->save_buffer;
700 png_ptr->buffer_size = 0; 703 png_ptr->buffer_size = 0;
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 1235
1233 png_voidp PNGAPI 1236 png_voidp PNGAPI
1234 png_get_progressive_ptr(png_structp png_ptr) 1237 png_get_progressive_ptr(png_structp png_ptr)
1235 { 1238 {
1236 if (png_ptr == NULL) 1239 if (png_ptr == NULL)
1237 return (NULL); 1240 return (NULL);
1238 1241
1239 return png_ptr->io_ptr; 1242 return png_ptr->io_ptr;
1240 } 1243 }
1241 #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ 1244 #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698