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

don't parse floats with scanf

Browse Source 
since scanf uses the current locale, duh

see https://github.com/libvips/libvips/issues/3191
This commit is contained in:
John Cupitt 2022-11-28 08:51:13 +00:00
parent 4611651d90
commit cbfbeb6e2d
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libvips/iofuncs/object.c
View File

@ -2083,11 +2083,8 @@ vips_object_set_argument_from_string( VipsObject *object,
return( -1 );
}
if( sscanf( value, "%lg", &d ) != 1 ) {
vips_error( class->nickname,
_( "'%s' is not a double" ), value );
if( vips_strtod( value, &d ) )
return( -1 );
}
g_value_init( &gvalue, G_TYPE_DOUBLE );
g_value_set_double( &gvalue, d );

14
libvips/iofuncs/type.c
View File

@ -931,14 +931,11 @@ transform_g_string_array_int( const GValue *src_value, GValue *dest_value )
/* Walk the string to get the number of elements.
* We need a copy of the string, since we insert \0 during
* scan.
*
* We can't allow ',' as a separator, since some locales use it as a
* decimal point.
*/
str = g_value_dup_string( src_value );
n = 0;
for( p = str; (q = vips_break_token( p, "\t; " )); p = q )
for( p = str; (q = vips_break_token( p, "\t;, " )); p = q )
n += 1;
g_free( str );
@ -1158,14 +1155,11 @@ transform_g_string_array_double( const GValue *src_value, GValue *dest_value )
/* Walk the string to get the number of elements.
* We need a copy of the string, since we insert \0 during scan.
*
* We can't allow ',' as a separator since some locales use it as a
* decimal point.
*/
str = g_value_dup_string( src_value );
n = 0;
for( p = str; (q = vips_break_token( p, "\t; " )); p = q )
for( p = str; (q = vips_break_token( p, "\t;, " )); p = q )
n += 1;
g_free( str );
@ -1177,11 +1171,9 @@ transform_g_string_array_double( const GValue *src_value, GValue *dest_value )
i = 0;
for( p = str; (q = vips_break_token( p, "\t; " )); p = q ) {
if( sscanf( p, "%lf", &array[i] ) != 1 ) {
if( !vips_strtod( p, &array[i] ) ) {
/* Set array to length zero to indicate an error.
*/
vips_error( "vipstype",
_( "unable to convert \"%s\" to float" ), p );
vips_value_set_array_double( dest_value, NULL, 0 );
g_free( str );
return;