cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* tools/tiffdump.c: Guard against arithmetic overflow when

Browse Source 
calculating allocation buffer sizes.
This commit is contained in:
Bob Friesenhahn 2014-12-22 02:52:38 +00:00
parent 5db18217c3
commit 53c7c58dd7
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-12-21 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* tools/tiffdump.c: Guard against arithmetic overflow when
calculating allocation buffer sizes.
2014-12-21 Even Rouault <even.rouault@spatialys.com> 2014-12-21 Even Rouault <even.rouault@spatialys.com>
* tools/tiff2bw.c: when Photometric=RGB, the utility only works if * tools/tiff2bw.c: when Photometric=RGB, the utility only works if

23
tools/tiffdump.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffdump.c,v 1.29 2014-12-21 15:15:32 erouault Exp $ */ /* $Id: tiffdump.c,v 1.30 2014-12-22 02:52:38 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -34,6 +34,8 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#include "tiffiop.h"
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
# include <fcntl.h> # include <fcntl.h>
#endif #endif
@ -233,8 +235,21 @@ dump(int fd, uint64 diroff)
Fatal("Cycle detected in chaining of TIFF directories!"); Fatal("Cycle detected in chaining of TIFF directories!");
} }
} }
visited_diroff = (uint64*) realloc(visited_diroff, {
(count_visited_dir + 1) * sizeof(uint64)); size_t alloc_size;
alloc_size=TIFFSafeMultiply(tmsize_t,(count_visited_dir + 1),
sizeof(uint64));
if (alloc_size == 0)
{
if (visited_diroff)
free(visited_diroff);
visited_diroff = 0;
}
else
{
visited_diroff = (uint64*) realloc(visited_diroff,alloc_size);
}
}
if( !visited_diroff ) if( !visited_diroff )
Fatal("Out of memory"); Fatal("Out of memory");
visited_diroff[count_visited_dir] = diroff; visited_diroff[count_visited_dir] = diroff;
@ -322,7 +337,7 @@ ReadDirectory(int fd, unsigned int ix, uint64 off)
dircount = (uint16)dircount64; dircount = (uint16)dircount64;
direntrysize = 20; direntrysize = 20;
} }
dirmem = _TIFFmalloc(dircount * direntrysize); dirmem = _TIFFmalloc(TIFFSafeMultiply(tmsize_t,dircount,direntrysize));
if (dirmem == NULL) { if (dirmem == NULL) {
Fatal("No space for TIFF directory"); Fatal("No space for TIFF directory");
goto done; goto done;