Skip to content

Commit e33f6f6

Browse files
committed
8380078: Update GIFlib to 6.1.2
Backport-of: 76e7c9e
1 parent 14b779e commit e33f6f6

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/java.desktop/share/legal/giflib.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## GIFLIB v6.1.1
1+
## GIFLIB v6.1.2
22

33
### GIFLIB License
44
```

src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern "C" {
3939

4040
#define GIFLIB_MAJOR 6
4141
#define GIFLIB_MINOR 1
42-
#define GIFLIB_RELEASE 1
42+
#define GIFLIB_RELEASE 2
4343

4444
#define GIF_ERROR 0
4545
#define GIF_OK 1

src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,14 @@ SavedImage *GifMakeSavedImage(GifFileType *GifFile,
373373
* aliasing problems.
374374
*/
375375

376+
/* Null out aliased pointers before any allocations
377+
* so that FreeLastSavedImage won't free CopyFrom's
378+
* data if an allocation fails partway through. */
379+
sp->ImageDesc.ColorMap = NULL;
380+
sp->RasterBits = NULL;
381+
sp->ExtensionBlocks = NULL;
382+
sp->ExtensionBlockCount = 0;
383+
376384
/* first, the local color map */
377385
if (CopyFrom->ImageDesc.ColorMap != NULL) {
378386
sp->ImageDesc.ColorMap = GifMakeMapObject(

0 commit comments

Comments
 (0)