sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #463 from jcupitt/revert-462-better-dzsave-zip64-checks

Browse Source 
Revert "[WIP] More accurate dzsave zip size estimation"
This commit is contained in:
John Cupitt 2016-06-04 10:44:19 +01:00
commit a647ee36ba
1 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libvips/foreign/dzsave.c
View File

@ -326,14 +326,6 @@ typedef struct _VipsGsfDirectory {
*/ */
GsfOutput *container; GsfOutput *container;
/* Track number of files for ZIP64 limit check.
*/
unsigned int file_count;
/* Track length of file names for ZIP64 limit check.
*/
unsigned int filename_lengths;
} VipsGsfDirectory; } VipsGsfDirectory;
/* Close all dirs, non-NULL on error. /* Close all dirs, non-NULL on error.
@ -401,8 +393,6 @@ vips_gsf_tree_new( GsfOutput *out, gboolean no_compression )
tree->out = out; tree->out = out;
tree->no_compression = no_compression; tree->no_compression = no_compression;
tree->container = NULL; tree->container = NULL;
tree->file_count = 0;
tree->filename_lengths = 0;
return( tree ); return( tree );
} }
@ -475,18 +465,13 @@ vips_gsf_path( VipsGsfDirectory *tree, const char *name, ... )
char *dir_name; char *dir_name;
GsfOutput *obj; GsfOutput *obj;
tree->file_count += 1;
tree->filename_lengths += strlen(tree->out->name) + 1 + strlen(name);
dir = tree; dir = tree;
va_start( ap, name ); va_start( ap, name );
while( (dir_name = va_arg( ap, char * )) ) { while( (dir_name = va_arg( ap, char * )) )
tree->filename_lengths += strlen(dir_name) + 1;
if( (child = vips_gsf_child_by_name( dir, dir_name )) ) if( (child = vips_gsf_child_by_name( dir, dir_name )) )
dir = child; dir = child;
else else
dir = vips_gsf_dir_new( dir, dir_name ); dir = vips_gsf_dir_new( dir, dir_name );
}
va_end( ap ); va_end( ap );
if( dir->no_compression ) if( dir->no_compression )
@ -1166,26 +1151,6 @@ tile_equal( VipsImage *image, VipsPel * restrict ink )
return( TRUE ); return( TRUE );
} }
#define VIPS_ZIP_FIXED_LH_SIZE (30 + 29)
#define VIPS_ZIP_FIXED_CD_SIZE (46 + 9)
#define VIPS_ZIP_EOCD_SIZE 22
static size_t
estimate_zip_size( VipsForeignSaveDz *dz )
{
size_t estimated_zip_size = dz->bytes_written
+ dz->tree->file_count * VIPS_ZIP_FIXED_LH_SIZE
+ dz->tree->filename_lengths
+ dz->tree->file_count * VIPS_ZIP_FIXED_CD_SIZE
+ dz->tree->filename_lengths
+ VIPS_ZIP_EOCD_SIZE;
#ifdef DEBUG_VERBOSE
printf( "estimate_zip_size: %zd\n", estimated_zip_size );
#endif /*DEBUG_VERBOSE*/
return estimated_zip_size;
}
static int static int
strip_work( VipsThreadState *state, void *a ) strip_work( VipsThreadState *state, void *a )
{ {
@ -1303,22 +1268,18 @@ strip_work( VipsThreadState *state, void *a )
return( -1 ); return( -1 );
} }
/* Allow a 100,000 byte margin. This probably isn't enough: we don't
* include the space zip needs for the index nor anything we are
* outputting apart from the gsf_output_write() above.
*/
if( dz->container == VIPS_FOREIGN_DZ_CONTAINER_ZIP && if( dz->container == VIPS_FOREIGN_DZ_CONTAINER_ZIP &&
!vips_gsf_has_zip64() ) { !vips_gsf_has_zip64() &&
/* Leave 3 entry headroom for blank.png and metadata files. */ dz->bytes_written > (size_t) UINT_MAX - 100000 ) {
if( dz->tree->file_count + 3 >= (unsigned int) USHRT_MAX ) { g_mutex_unlock( vips__global_lock );
g_mutex_unlock( vips__global_lock );
vips_error( class->nickname, vips_error( class->nickname,
"%s", _( "output file limit exceeded" ) ); "%s", _( "output file too large" ) );
return( -1 ); return( -1 );
}
/* Leave 16k headroom for blank.png and metadata files. */
if( estimate_zip_size( dz ) > (size_t) UINT_MAX - 16384) {
g_mutex_unlock( vips__global_lock );
vips_error( class->nickname,
"%s", _( "output file too large" ) );
return( -1 );
}
} }
g_mutex_unlock( vips__global_lock ); g_mutex_unlock( vips__global_lock );