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

Merge pull request #1627 from kleisauke/temp-name-atomic

Browse Source 
Ensure vips__temp_name creates unique filenames
This commit is contained in:
John Cupitt 2020-04-30 13:53:54 +01:00 committed by GitHub
commit 3aef92bc51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvips/iofuncs/util.c
View File

@ -1688,14 +1688,23 @@ vips__temp_dir( void )
char * char *
vips__temp_name( const char *format ) vips__temp_name( const char *format )
{ {
static int serial = 0; static int global_serial = 0;
char file[FILENAME_MAX]; char file[FILENAME_MAX];
char file2[FILENAME_MAX]; char file2[FILENAME_MAX];
char *name; char *name;
/* Old glibs named this differently.
*/
int serial =
#if GLIB_CHECK_VERSION( 2, 30, 0 )
g_atomic_int_add( &global_serial, 1 );
#else
g_atomic_int_exchange_and_add( &global_serial, 1 );
#endif
vips_snprintf( file, FILENAME_MAX, "vips-%d-%u", vips_snprintf( file, FILENAME_MAX, "vips-%d-%u",
serial++, g_random_int() ); serial, g_random_int() );
vips_snprintf( file2, FILENAME_MAX, format, file ); vips_snprintf( file2, FILENAME_MAX, format, file );
name = g_build_filename( vips__temp_dir(), file2, NULL ); name = g_build_filename( vips__temp_dir(), file2, NULL );