From 5a60dd26f937ff323037eb6dbb9d7f358dae61f3 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 26 Feb 2016 12:41:48 +0000 Subject: [PATCH] fix parsing of filenames containing brackets oops, missed part of a regexp in parse_token, see: https://github.com/jcupitt/libvips/issues/395 thanks shilpi230 --- ChangeLog | 1 + libvips/iofuncs/util.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a69d216..4db0aebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 27/1/16 started 8.2.3 - fix a crash with SPARC byte-order labq vips images +- fix parsing of filenames containing brackets, thanks shilpi230 12/1/16 started 8.2.2 - changes to ease compiling C++ binding with MSVC [Lovell Fuller] diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c index 75c75b82..9547b8f9 100644 --- a/libvips/iofuncs/util.c +++ b/libvips/iofuncs/util.c @@ -1228,7 +1228,7 @@ vips__token_get( const char *p, VipsToken *token, char *string, int size ) * so the next break must be bracket, equals, comma. */ *token = VIPS_TOKEN_STRING; - n = strcspn( p, "<[{()}]>=," ); + n = strcspn( p, "[]=," ); i = VIPS_MIN( n, size ); vips_strncpy( string, p, i + 1 ); p += n;