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

better error detection in vips_system()

Browse Source
This commit is contained in:
John Cupitt 2014-07-17 03:31:58 +01:00
parent 9d096c39f1
commit a0a6868d90
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
- vips_scale() now does round to nearest to avoid rounding errors - vips_scale() now does round to nearest to avoid rounding errors
- improve im_openout() compat macro - improve im_openout() compat macro
- more vips7 compatibility fixes, thanks steve - more vips7 compatibility fixes, thanks steve
- more robust vips_system()
30/6/14 started 7.40.3 30/6/14 started 7.40.3
- fix interlaced thumbnails in vipsthumbnail, thanks lovell - fix interlaced thumbnails in vipsthumbnail, thanks lovell

5
libvips/iofuncs/system.c
View File

@ -177,7 +177,8 @@ vips_system_build( VipsObject *object )
memmove( p, p + 1, strlen( p ) ); memmove( p, p + 1, strlen( p ) );
if( !g_spawn_command_line_sync( cmd, if( !g_spawn_command_line_sync( cmd,
&std_output, &std_error, &result, &error ) ) { &std_output, &std_error, &result, &error ) ||
result ) {
if( error ) { if( error ) {
vips_error( class->nickname, "%s", error->message ); vips_error( class->nickname, "%s", error->message );
g_error_free( error ); g_error_free( error );
@ -202,8 +203,6 @@ vips_system_build( VipsObject *object )
return( -1 ); return( -1 );
} }
g_assert( !result );
if( std_error ) { if( std_error ) {
vips__chomp( std_error ); vips__chomp( std_error );
if( strcmp( std_error, "" ) != 0 ) if( strcmp( std_error, "" ) != 0 )